Make get_headers() use the default context.

diff --git a/NEWS b/NEWS
index 60d5b82d2dd4b5ce7474daacedadbdc80014fbc0..44739b92775fbd47986a1c1f65486d13abca8b67 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2006, PHP 5.1.3
+- Make get_headers() use the default context. (Ilia)
 - Added a check for special characters in the session name. (Ilia)
 - Added "consumed" stream filter. (Marcus)
 - Added new mysqli constants for BIT and NEW_DECIMAL field types:

diff --git a/ext/standard/url.c b/ext/standard/url.c
index f63509c5d8d2fa5475bc7d37f39fc5de1ff3ca72..43c47b38d9c8f08cbfff257d6aa245c5a8fb3e93 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -25,6 +25,7 @@
 #include "php.h"
 
 #include "url.h"
+#include "file.h"
 #ifdef _OSD_POSIX
 #ifndef APACHE
 #error On this EBCDIC platform, PHP is only supported as an Apache module.
@@ -658,7 +659,7 @@ PHP_FUNCTION(get_headers)
 {
        char *url;
        int url_len;
-       php_stream_context *context = NULL;
+       php_stream_context *context;
        php_stream *stream;
        zval **prev_val, **hdr = NULL;
        HashPosition pos;
@@ -667,6 +668,7 @@ PHP_FUNCTION(get_headers)
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &url, &url_len, &format) == FAILURE) {
                return;
        }
+       context = FG(default_context) ? FG(default_context) : (FG(default_context) = php_stream_context_alloc());
 
        if (!(stream = php_stream_open_wrapper_ex(url, "r", REPORT_ERRORS | STREAM_USE_URL | STREAM_ONLY_GET_HEADERS, NULL, context))) {
                RETURN_FALSE;