From: Stanislav Malyshev <stas@php.net>
Date: Wed, 17 Dec 2008 11:33:56 +0000 (+0000)
Subject: fix #46005: User not consistently logged under Apache2
X-Git-Tag: php-5.4.0alpha1~191^2~4797
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cd34ac3d313f9f017a3937ea04520a161e52b31;p=php

fix #46005: User not consistently logged under Apache2
---

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 401c556b94..78fc41eda3 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -434,6 +434,10 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx TSRMLS_DC)
 	apr_table_unset(f->r->headers_out, "ETag");
 	auth = apr_table_get(f->r->headers_in, "Authorization");
 	php_handle_auth_data(auth TSRMLS_CC);
+	if (SG(request_info).auth_user == NULL && f->r->user) {
+		SG(request_info).auth_user = estrdup(f->r->user);
+	}
+	ctx->r->user = apr_pstrdup(ctx->r->pool, SG(request_info).auth_user);
 	php_request_startup(TSRMLS_C);
 }
 
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index d410b78823..440ba0b5ec 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -471,6 +471,9 @@ static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
 	apr_table_unset(r->headers_out, "ETag");
 	auth = apr_table_get(r->headers_in, "Authorization");
 	php_handle_auth_data(auth TSRMLS_CC);
+	if (SG(request_info).auth_user == NULL && r->user) {
+		SG(request_info).auth_user = estrdup(r->user);
+	}
 	ctx->r->user = apr_pstrdup(ctx->r->pool, SG(request_info).auth_user);
 	return php_request_startup(TSRMLS_C);
 }