From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 16 Apr 2003 23:31:23 +0000 (+0000)
Subject: Fixed bug #23232 (safe_mode does not honor PHP_AUTH_* in apache2)
X-Git-Tag: RELEASE_0_5~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7d72d178d9fc7a5774030924238cb881ac31948;p=php

Fixed bug #23232 (safe_mode does not honor PHP_AUTH_* in apache2)
---

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 86e3b68737..5188569640 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -396,7 +396,7 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx TSRMLS_DC)
 	apr_table_unset(f->r->headers_out, "Expires");
 	apr_table_unset(f->r->headers_out, "ETag");
 	apr_table_unset(f->r->headers_in, "Connection");
-	if (!PG(safe_mode)) {
+	if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
 		auth = apr_table_get(f->r->headers_in, "Authorization");
 		php_handle_auth_data(auth TSRMLS_CC);
 	} else {
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index f6697ba6ac..08f5a84d9d 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -424,7 +424,7 @@ static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
 	apr_table_unset(r->headers_out, "Expires");
 	apr_table_unset(r->headers_out, "ETag");
 	apr_table_unset(r->headers_in, "Connection");
-	if (!PG(safe_mode)) {
+	if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
 		auth = apr_table_get(r->headers_in, "Authorization");
 		php_handle_auth_data(auth TSRMLS_CC);
 		ctx->r->user = apr_pstrdup(ctx->r->pool, SG(request_info).auth_user);