@- Fixed bug with Apache which let PHP_AUTH_* variables to be set when

@  external basic auth mechanism was used. (Jani)

Fixes bugs: #16653, #14534, #14370

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index e3afd228b47ef7c20f19a9adb0136ca4760ed788..690a7c3c8d0bc70f1e82d7e95daa5ffe4d83350f 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -403,7 +403,7 @@ static void init_request_info(TSRMLS_D)
                authorization = table_get(r->headers_in, "Authorization");
        }
        if (authorization
-/*             && !auth_type(r) */
+               && !auth_type(r)
                && !strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) {
                tmp = uudecode(r->pool, authorization);
                SG(request_info).auth_user = getword_nulls_nc(r->pool, &tmp, ':');