diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/curl/interface.c | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 6a616411ef..072c23e48d 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1449,14 +1449,12 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx) ZVAL_STRINGL(&argv[1], data, length); fci.size = sizeof(fci); - fci.function_table = EG(function_table); fci.object = NULL; ZVAL_COPY_VALUE(&fci.function_name, &t->func_name); fci.retval = &retval; fci.param_count = 2; fci.params = argv; fci.no_separation = 0; - fci.symbol_table = NULL; ch->in_callback = 1; error = zend_call_function(&fci, &t->fci_cache); @@ -1500,14 +1498,12 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string) ZVAL_STRING(&argv[2], string); fci.size = sizeof(fci); - fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fci.function_name, &t->func_name); fci.object = NULL; fci.retval = &retval; fci.param_count = 3; fci.params = argv; fci.no_separation = 0; - fci.symbol_table = NULL; ch->in_callback = 1; error = zend_call_function(&fci, &t->fci_cache); @@ -1557,14 +1553,12 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ZVAL_LONG(&argv[4], (zend_long)ulnow); fci.size = sizeof(fci); - fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fci.function_name, &t->func_name); fci.object = NULL; fci.retval = &retval; fci.param_count = 5; fci.params = argv; fci.no_separation = 0; - fci.symbol_table = NULL; ch->in_callback = 1; error = zend_call_function(&fci, &t->fci_cache); @@ -1620,14 +1614,12 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) ZVAL_LONG(&argv[2], (int)size * nmemb); fci.size = sizeof(fci); - fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fci.function_name, &t->func_name); fci.object = NULL; fci.retval = &retval; fci.param_count = 3; fci.params = argv; fci.no_separation = 0; - fci.symbol_table = NULL; ch->in_callback = 1; error = zend_call_function(&fci, &t->fci_cache); @@ -1688,9 +1680,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx ZVAL_STRINGL(&argv[1], data, length); fci.size = sizeof(fci); - fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fci.function_name, &t->func_name); - fci.symbol_table = NULL; fci.object = NULL; fci.retval = &retval; fci.param_count = 2; @@ -3364,9 +3354,7 @@ PHP_FUNCTION(curl_close) return; } - if (Z_REFCOUNT_P(zid) <= 2) { - zend_list_close(Z_RES_P(zid)); - } + zend_list_close(Z_RES_P(zid)); } /* }}} */ |