From 87c4a01b87608b7abc12c8258aad8b052b8c5a67 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 7 Mar 2006 14:43:16 +0000 Subject: Nuke safe_mode from sapi/* # only main/ remains at this point, this is the next step --- sapi/apache2handler/sapi_apache2.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'sapi/apache2handler/sapi_apache2.c') diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index ce120f3544..9cf3766fd7 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -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); } -- cgit v1.2.1