diff options
| author | Anatol Belski <ab@php.net> | 2014-07-14 20:28:23 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-14 20:28:23 +0200 |
| commit | 1fef4e87fcba82e4e937382063483ee61f764936 (patch) | |
| tree | 0c511e687529434254e87ec1616976b84dbb2428 | |
| parent | 40955e27f789b2b0b3873b11c23f017ffc03cd86 (diff) | |
| parent | 236365a016df0f1976b0f9d063340231eb1fb4c8 (diff) | |
| download | php-git-1fef4e87fcba82e4e937382063483ee61f764936.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix C89 compat
This test depends on expose_php being on
The test output is dependent on expose_php ini
1.2 is a problematic float to print out Lower the default display precision for this test
Test output relies on expose_php being on
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 3eecd7bdae..645b2ee0c3 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -224,6 +224,8 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, efree(transport_string); if (stream && use_proxy && use_ssl) { + smart_str header = {0}; + /* Set peer_name or name verification will try to use the proxy server name */ if (!context || php_stream_context_get_option(context, "ssl", "peer_name", &tmpzval) == FAILURE) { MAKE_STD_ZVAL(ssl_proxy_peer_name); @@ -231,8 +233,6 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, php_stream_context_set_option(stream->context, "ssl", "peer_name", ssl_proxy_peer_name); } - smart_str header = {0}; - smart_str_appendl(&header, "CONNECT ", sizeof("CONNECT ")-1); smart_str_appends(&header, resource->host); smart_str_appendc(&header, ':'); |