diff options
| author | David Carlier <devnexen@gmail.com> | 2016-06-27 07:42:49 +0100 |
|---|---|---|
| committer | David Carlier <devnexen@gmail.com> | 2016-06-27 07:44:21 +0100 |
| commit | 85e985f191c228cb6b119ebe223d682c9166fdc2 (patch) | |
| tree | 108e0d17ee6b4929f2f1a057e3da4f62fc307781 /ext/curl/php_curl.h | |
| parent | 8de8636a2b6dc331486284f1f037259bb7347768 (diff) | |
| download | php-git-85e985f191c228cb6b119ebe223d682c9166fdc2.tar.gz | |
couple of resource leaks fixes and use after free's
Diffstat (limited to 'ext/curl/php_curl.h')
| -rw-r--r-- | ext/curl/php_curl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index d3a22c7c30..02077aaf27 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -90,14 +90,17 @@ PHP_FUNCTION(curl_multi_info_read); PHP_FUNCTION(curl_multi_init); PHP_FUNCTION(curl_multi_remove_handle); PHP_FUNCTION(curl_multi_select); +PHP_FUNCTION(curl_multi_errno); PHP_FUNCTION(curl_share_close); PHP_FUNCTION(curl_share_init); PHP_FUNCTION(curl_share_setopt); +PHP_FUNCTION(curl_share_errno); #if LIBCURL_VERSION_NUM >= 0x070c00 /* 7.12.0 */ PHP_FUNCTION(curl_strerror); PHP_FUNCTION(curl_multi_strerror); +PHP_FUNCTION(curl_share_strerror); #endif #if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */ @@ -114,6 +117,7 @@ PHP_FUNCTION(curl_multi_setopt); #if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */ PHP_FUNCTION(curl_pause); #endif + PHP_FUNCTION(curl_file_create); @@ -190,10 +194,16 @@ typedef struct { int still_running; CURLM *multi; zend_llist easyh; + struct { + int no; + } err; } php_curlm; typedef struct { CURLSH *share; + struct { + int no; + } err; } php_curlsh; void _php_curl_cleanup_handle(php_curl *); |