[PHP4BETA] CVS update: php4/php4isapi

Date: Wednesday May 12, 1999 @ 17:35 Author: zeev Update of /repository/php4/php4isapi In directory php:/tmp/cvs-serv17694/php4isapi Modified Files: php4isapi.c Log Message: Support HTTP Auth under ISAPI. Now, these short pieces of code took *A LOT* of research :( Index: php4/php4isapi/php4isapi.c diff -u php4/php4isapi/php4isapi.c:1.16 php4/php4isapi/php4isapi.c:1.17 --- php4/php4isapi/php4isapi.c:1.16 Wed May 12 13:07:35 1999 +++ php4/php4isapi/php4isapi.c Wed May 12 17:35:16 1999 @@ -110,7 +110,6 @@ static int sapi_isapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC) { - /* This will probably become a bit more complex */ return SAPI_HEADER_ADD; } @@ -281,14 +280,19 @@ SG(request_info).auth_user = NULL; SG(request_info).auth_password = NULL; break; - case SF_NOTIFY_AUTHENTICATION: - SG(request_info).auth_user = ((HTTP_FILTER_AUTHENT *) pvNotification)->pszUser; - SG(request_info).auth_password = ((HTTP_FILTER_AUTHENT *) pvNotification)->pszUser; - if (SG(request_info).auth_user) { - SG(request_info).auth_user = estrdup(SG(request_info).auth_user); - } - if (SG(request_info).auth_password) { - SG(request_info).auth_password = estrdup(SG(request_info).auth_password); + case SF_NOTIFY_AUTHENTICATION: { + char *auth_user = ((HTTP_FILTER_AUTHENT *) pvNotification)->pszUser; + char *auth_password = ((HTTP_FILTER_AUTHENT *) pvNotification)->pszPassword; + + if (auth_user && auth_user[0]) { + SG(request_info).auth_user = estrdup(auth_user); + } + if (auth_password && auth_password[0]) { + SG(request_info).auth_password = estrdup(auth_password); + } + auth_user[0] = 0; + auth_password[0] = 0; + return SF_STATUS_REQ_HANDLED_NOTIFICATION; } break; } -- PHP 4 Beta