Fixed bug #29805 (HTTP Authentication Issues)

diff --git a/NEWS b/NEWS
index 2085bd5164cb6269733f2bf2b0fd9ba21a2d0f7d..14a051836e2b5821a040e251b57ad9db1ed2fe8f 100644 (file)
--- 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 84a3c1bfaa6ac83a58fed01f8f10bcf05fbc730c..278980a573902b1056e598dae2467d95063f9701 100644 (file)
--- 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;