mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
Nuke safe_mode from sapi/*
# only main/ remains at this point, this is the next step
This commit is contained in:
parent
d88e3ee93d
commit
87c4a01b87
6 changed files with 17 additions and 35 deletions
|
@ -427,14 +427,9 @@ static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
|
|||
apr_table_unset(r->headers_out, "Last-Modified");
|
||||
apr_table_unset(r->headers_out, "Expires");
|
||||
apr_table_unset(r->headers_out, "ETag");
|
||||
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);
|
||||
} else {
|
||||
SG(request_info).auth_user = NULL;
|
||||
SG(request_info).auth_password = NULL;
|
||||
}
|
||||
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);
|
||||
return php_request_startup(TSRMLS_C);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue