com php-src: Remove leftover code dealing with curl wrappers: ext/standard/url.c
| From: | Nikita Popov | Date: | Thu, 11 Oct 2018 10:12:31 +0000 |
| Subject: | com php-src: Remove leftover code dealing with curl wrappers: ext/standard/url.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103430@lists.php.net to get a copy of this message | ||
Commit: a710ceee62680e88e8fe90490c3a91321810fa62
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 11 Oct 2018 12:12:31 +0200
Parents: 32d7e08286be3f7a1d8529d306a8cecebde8555c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a710ceee62680e88e8fe90490c3a91321810fa62
Log:
Remove leftover code dealing with curl wrappers
Changed paths:
M ext/standard/url.c
Diff:
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 1117d6e..9d0b872 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -666,7 +666,6 @@ PHP_FUNCTION(get_headers)
size_t url_len;
php_stream *stream;
zval *prev_val, *hdr = NULL, *h;
- HashTable *hashT;
zend_long format = 0;
zval *zcontext = NULL;
php_stream_context *context;
@@ -691,19 +690,7 @@ PHP_FUNCTION(get_headers)
array_init(return_value);
- /* check for curl-wrappers that provide headers via a special "headers" element */
- if ((h = zend_hash_str_find(HASH_OF(&stream->wrapperdata), "headers",
sizeof("headers")-1)) != NULL && Z_TYPE_P(h) == IS_ARRAY) {
- /* curl-wrappers don't load data until the 1st read */
- if (!Z_ARRVAL_P(h)->nNumOfElements) {
- php_stream_getc(stream);
- }
- h = zend_hash_str_find(HASH_OF(&stream->wrapperdata), "headers",
sizeof("headers")-1);
- hashT = Z_ARRVAL_P(h);
- } else {
- hashT = HASH_OF(&stream->wrapperdata);
- }
-
- ZEND_HASH_FOREACH_VAL(hashT, hdr) {
+ ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&stream->wrapperdata), hdr) {
if (Z_TYPE_P(hdr) != IS_STRING) {
continue;
}