cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

moriyoshi Tue May 13 15:35:49 2003 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/apache2handler sapi_apache2.c Log: Oops Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.111 php4/sapi/apache2filter/sapi_apache2.c:1.112 --- php4/sapi/apache2filter/sapi_apache2.c:1.111 Tue May 13 15:33:36 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Tue May 13 15:35:49 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.111 2003/05/13 19:33:36 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.112 2003/05/13 19:35:49 moriyoshi Exp $ */ #include <fcntl.h> @@ -402,15 +402,8 @@ 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 { Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.17 php4/sapi/apache2handler/sapi_apache2.c:1.18 --- php4/sapi/apache2handler/sapi_apache2.c:1.17 Tue May 13 15:33:36 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Tue May 13 15:35:49 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.17 2003/05/13 19:33:36 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.18 2003/05/13 19:35:49 moriyoshi Exp $ */ #include <fcntl.h> @@ -431,11 +431,8 @@ 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);