diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-11 12:12:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-11 12:12:31 +0200 |
| commit | a710ceee62680e88e8fe90490c3a91321810fa62 (patch) | |
| tree | 673aabf250903a701b7b2cf0ee758eef658df8af /ext | |
| parent | 32d7e08286be3f7a1d8529d306a8cecebde8555c (diff) | |
| download | php-git-a710ceee62680e88e8fe90490c3a91321810fa62.tar.gz | |
Remove leftover code dealing with curl wrappers
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/url.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index 1117d6ed63..9d0b872cfa 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; } |