cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/cgi cgi_main.c /sapi/thttpd thttpd.c

sas Fri Oct 27 03:31:10 2000 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/cgi cgi_main.c /php4/sapi/thttpd thttpd.c Log: Leave initializing of auth_(user|password) to php_handle_auth_data(). Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.3 php4/sapi/apache2filter/sapi_apache2.c:1.4 --- php4/sapi/apache2filter/sapi_apache2.c:1.3 Fri Oct 27 03:19:40 2000 +++ php4/sapi/apache2filter/sapi_apache2.c Fri Oct 27 03:31:10 2000 @@ -209,8 +209,7 @@ apr_table_set(f->r->headers_in, "Connection", "close"); apr_table_unset(f->r->headers_out, "Content-Length"); auth = apr_table_get(f->r->headers_in, "Authorization"); - if (auth) - php_handle_auth_data(auth SLS_CC); + php_handle_auth_data(auth SLS_CC); } /* moves data from bb to ctx->bb */ Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.76 php4/sapi/cgi/cgi_main.c:1.77 --- php4/sapi/cgi/cgi_main.c:1.76 Fri Oct 27 03:26:57 2000 +++ php4/sapi/cgi/cgi_main.c Fri Oct 27 03:31:10 2000 @@ -329,13 +329,8 @@ SG(sapi_headers).http_response_code = 200; /* The CGI RFC allows servers to pass on unvalidated Authorization data */ - if ((auth = getenv("HTTP_AUTHORIZATION"))) { - php_handle_auth_data(auth SLS_CC); - } else { - SG(request_info).auth_user = NULL; - SG(request_info).auth_password = NULL; - } - + auth = getenv("HTTP_AUTHORIZATION"); + php_handle_auth_data(auth SLS_CC); } Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.25 php4/sapi/thttpd/thttpd.c:1.26 --- php4/sapi/thttpd/thttpd.c:1.25 Fri Oct 27 03:19:06 2000 +++ php4/sapi/thttpd/thttpd.c Fri Oct 27 03:31:10 2000 @@ -238,9 +238,6 @@ SG(request_info).content_type = TG(hc)->contenttype; SG(request_info).content_length = TG(hc)->contentlength; - SG(request_info).auth_user = NULL; - SG(request_info).auth_password = NULL; - php_handle_auth_data(TG(hc)->authorization SLS_CC); TG(post_off) = TG(hc)->read_idx - TG(hc)->checked_idx;