diff options
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 9 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 3df022b343..c530bab8a3 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -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, "ETag"); 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))) { ->>>>>>> 1.110 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 5734d06c03..ae403d505e 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -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, "ETag"); 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))) { ->>>>>>> 1.15 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); |