mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Oops
This commit is contained in:
parent
e54919d230
commit
0d39841728
@ -402,15 +402,8 @@ 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, "Expires");
|
||||||
apr_table_unset(f->r->headers_out, "ETag");
|
apr_table_unset(f->r->headers_out, "ETag");
|
||||||
apr_table_unset(f->r->headers_in, "Connection");
|
apr_table_unset(f->r->headers_in, "Connection");
|
||||||
<<<<<<< sapi_apache2.c
|
|
||||||
<<<<<<< sapi_apache2.c
|
|
||||||
if (!PG(safe_mode) || (PG(safe_mode) && ap_auth_type() == NULL)) {
|
|
||||||
=======
|
|
||||||
if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
|
|
||||||
>>>>>>> 1.109
|
|
||||||
=======
|
|
||||||
if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(f->r))) {
|
if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(f->r))) {
|
||||||
>>>>>>> 1.110
|
|
||||||
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);
|
||||||
} else {
|
} else {
|
||||||
|
@ -431,11 +431,8 @@ 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, "Expires");
|
||||||
apr_table_unset(r->headers_out, "ETag");
|
apr_table_unset(r->headers_out, "ETag");
|
||||||
apr_table_unset(r->headers_in, "Connection");
|
apr_table_unset(r->headers_in, "Connection");
|
||||||
<<<<<<< sapi_apache2.c
|
|
||||||
if (!PG(safe_mode) || (PG(safe_mode) && ap_auth_type() == NULL)) {
|
|
||||||
=======
|
|
||||||
if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
|
if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
|
||||||
>>>>>>> 1.15
|
|
||||||
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);
|
||||||
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);
|
||||||
|
Loading…
Reference in New Issue
Block a user