MFH

diff --git a/php.ini-recommended b/php.ini-recommended
index 92982e4fe3c4ff792f28e2aa58b7e0885ff0a6d9..f166bc999cfcb5a59779a12dc604826f790a37ab 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -241,7 +241,7 @@ memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 ;
 ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
 ;
-;   - Show all errors except for notices
+;   - Show all errors
 ;
 error_reporting  =  E_ALL
 

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 750661ed4f611172fa2a68570f03917f9ede6f67..32a20783b20d116f0f21831685239a1f504387d6 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -434,7 +434,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, ':');