cvs: php4(PHP_4_3) /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

From: Date: Wed, 16 Apr 2003 23:31:39 +0000
Subject: cvs: php4(PHP_4_3) /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20344@lists.php.net to get a copy of this message
iliaa Wed Apr 16 19:31:39 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache2handler sapi_apache2.c /php4/sapi/apache2filter sapi_apache2.c Log: MFH Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.1.2.7 php4/sapi/apache2handler/sapi_apache2.c:1.1.2.8 --- php4/sapi/apache2handler/sapi_apache2.c:1.1.2.7 Thu Apr 10 07:35:07 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Wed Apr 16 19:31:39 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.7 2003/04/10 11:35:07 stas Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.8 2003/04/16 23:31:39 iliaa Exp $ */ #include <fcntl.h> @@ -422,7 +422,7 @@ apr_table_unset(r->headers_out, "Expires"); apr_table_unset(r->headers_out, "ETag"); apr_table_unset(r->headers_in, "Connection"); - if (!PG(safe_mode)) { + 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); Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91.2.7 php4/sapi/apache2filter/sapi_apache2.c:1.91.2.8 --- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.7 Thu Apr 10 07:31:37 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Wed Apr 16 19:31:39 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91.2.7 2003/04/10 11:31:37 stas Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.8 2003/04/16 23:31:39 iliaa Exp $ */ #include <fcntl.h> @@ -388,7 +388,7 @@ apr_table_unset(f->r->headers_out, "Expires"); apr_table_unset(f->r->headers_out, "ETag"); apr_table_unset(f->r->headers_in, "Connection"); - if (!PG(safe_mode)) { + if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) { auth = apr_table_get(f->r->headers_in, "Authorization"); php_handle_auth_data(auth TSRMLS_CC); } else {

« previous php.cvs (#20344) next »