diff options
| author | Pierrick Charron <pierrick@php.net> | 2013-01-01 21:12:02 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2013-01-01 21:12:02 -0500 |
| commit | 343a9199bbbf4f63b02099ceef27ef9881d8aa9f (patch) | |
| tree | e133bf1fb897b49b946ec29bf77551603e037b39 | |
| parent | a666285bc2488b7f7362368c388e41428610ad1d (diff) | |
| download | php-git-343a9199bbbf4f63b02099ceef27ef9881d8aa9f.tar.gz | |
Remove passwd handler from struct when not needed
CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one
| -rw-r--r-- | ext/curl/interface.c | 2 | ||||
| -rw-r--r-- | ext/curl/php_curl.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 125094c53a..e0c95efed5 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -3267,9 +3267,11 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC) if (ch->handlers->write_header->func_name) { zval_ptr_dtor(&ch->handlers->write_header->func_name); } +#if CURLOPT_PASSWDFUNCTION != 0 if (ch->handlers->passwd) { zval_ptr_dtor(&ch->handlers->passwd); } +#endif if (ch->handlers->std_err) { zval_ptr_dtor(&ch->handlers->std_err); } diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 3ae7060288..5c24fc1302 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -135,7 +135,9 @@ typedef struct { php_curl_write *write; php_curl_write *write_header; php_curl_read *read; +#if CURLOPT_PASSWDFUNCTION != 0 zval *passwd; +#endif zval *std_err; php_curl_progress *progress; #if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */ |