summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Schindler <thetaphi@php.net>2004-09-15 21:27:10 +0000
committerUwe Schindler <thetaphi@php.net>2004-09-15 21:27:10 +0000
commit8e3e81256fd6e9f56637a05715f44a07487b638c (patch)
tree8eb9f3a2609ce729205933d6d7fcfe3d3f79677b
parent24ec8acb2d8c1624babc13cf6ea03090829adb4d (diff)
downloadphp-git-8e3e81256fd6e9f56637a05715f44a07487b638c.tar.gz
Fixed bug #29805 (HTTP Authentication Issues)
-rw-r--r--NEWS1
-rw-r--r--sapi/nsapi/nsapi.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 2085bd5164..14a051836e 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ PHP NEWS
- Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid
data). (Ilia)
- Fixed bug #29808 (array_count_values() breaks with numeric strings). (Ilia)
+- Fixed bug #29805 (HTTP Authentication Issues). (Uwe Schindler)
- Fixed bug #29795 (SegFault with Soap and Amazon's Web Services). (Dmitry)
- Fixed bug #29737 (ip2long should return -1 if IP is 255.255.255.255 and FALSE
on error). (Tony)
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 84a3c1bfaa..278980a573 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -933,6 +933,8 @@ int NSAPI_PUBLIC php5_execute(pblock *pb, Session *sn, Request *rq)
SG(request_info).content_length = (content_length == NULL) ? 0 : strtoul(content_length, 0, 0);
SG(sapi_headers).http_response_code = (error_directive) ? rq->status_num : 200;
+ if (!PG(safe_mode)) php_handle_auth_data(pblock_findval("authorization", rq->headers) TSRMLS_CC);
+
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
file_handle.type = ZEND_HANDLE_FILENAME;