clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2003-05-13 19:35:49 +00:00
parent e54919d230
commit 0d39841728
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sapi/apache2filter/sapi_apache2.c
View File

@ -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 {

5
sapi/apache2handler/sapi_apache2.c
View File

@ -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);