archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #46005: User not consistently logged under Apache2

Browse source
This commit is contained in:
Stanislav Malyshev 2008-12-17 11:33:56 +00:00
parent 5c5a284f54
commit 4cd34ac3d3
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/apache2filter/sapi_apache2.c
View file

@ -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"); apr_table_unset(f->r->headers_out, "ETag");
auth = apr_table_get(f->r->headers_in, "Authorization"); auth = apr_table_get(f->r->headers_in, "Authorization");
php_handle_auth_data(auth TSRMLS_CC); 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); php_request_startup(TSRMLS_C);
} }

3
sapi/apache2handler/sapi_apache2.c
View file

@ -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"); apr_table_unset(r->headers_out, "ETag");
auth = apr_table_get(r->headers_in, "Authorization"); auth = apr_table_get(r->headers_in, "Authorization");
php_handle_auth_data(auth TSRMLS_CC); 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); ctx->r->user = apr_pstrdup(ctx->r->pool, SG(request_info).auth_user);
return php_request_startup(TSRMLS_C); return php_request_startup(TSRMLS_C);
} }