Oops

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 3df022b343d2a24d0fec811dacf706e115b6e894..c530bab8a3d08768a476a95f7e02514c0c94b644 100644 (file)
--- 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 5734d06c038a35e9e1a8283e34f2bd997fed258c..ae403d505ee0f4f350d2ad601c35c590c3817a7e 100644 (file)
--- 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);