cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Wed, 16 Apr 2003 23:31:23 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20343@lists.php.net to get a copy of this message | ||
iliaa Wed Apr 16 19:31:23 2003 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
/php4/sapi/apache2handler sapi_apache2.c
Log:
Fixed bug #23232 (safe_mode does not honor PHP_AUTH_* in apache2)
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.108 php4/sapi/apache2filter/sapi_apache2.c:1.109
--- php4/sapi/apache2filter/sapi_apache2.c:1.108 Thu Apr 10 07:28:54 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Wed Apr 16 19:31:22 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.108 2003/04/10 11:28:54 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.109 2003/04/16 23:31:22 iliaa Exp $ */
#include <fcntl.h>
@@ -396,7 +396,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 {
Index: php4/sapi/apache2handler/sapi_apache2.c
diff -u php4/sapi/apache2handler/sapi_apache2.c:1.14 php4/sapi/apache2handler/sapi_apache2.c:1.15
--- php4/sapi/apache2handler/sapi_apache2.c:1.14 Thu Apr 10 07:33:45 2003
+++ php4/sapi/apache2handler/sapi_apache2.c Wed Apr 16 19:31:23 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.14 2003/04/10 11:33:45 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.15 2003/04/16 23:31:23 iliaa Exp $ */
#include <fcntl.h>
@@ -424,7 +424,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);