cURL patch

From: Date: Wed, 22 Nov 2000 15:45:42 +0000
Subject: cURL patch
Groups: php.dev 
Request: Send a blank email to php-dev+get-38926@lists.php.net to get a copy of this message
Patch is below: Index: curl.c =================================================================== RCS file: /repository/php4/ext/curl/curl.c,v retrieving revision 1.26 diff -u -b -r1.26 curl.c --- curl.c 2000/11/22 15:19:59 1.26 +++ curl.c 2000/11/22 15:38:33 @@ -267,6 +267,9 @@ return SUCCESS; } +static void curl_free_string(void **string) { + efree(*string); +} /* {{{ proto string curl_version(void) Return the CURL version string. */ @@ -296,6 +299,8 @@ } memset(curl_handle, 0, sizeof(php_curl)); + zend_llist_init(&curl_handle->to_free,sizeof(char *),curl_free_string,0); + curl_handle->cp = curl_easy_init(); if (!curl_handle->cp) { php_error(E_ERROR, "Cannot initialize CURL Handle"); @@ -308,6 +313,7 @@ urlstr = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); curl_easy_setopt(curl_handle->cp, CURLOPT_URL, urlstr); + zend_llist_add_element(&curl_handle->to_free,&urlstr); } curl_easy_setopt(curl_handle->cp, CURLOPT_NOPROGRESS, 1); @@ -375,6 +381,7 @@ copystr = estrndup(Z_STRVAL_PP(curl_value), Z_STRLEN_PP(curl_value)); ret = curl_easy_setopt(curl_handle->cp, option, copystr); + zend_llist_add_element(&curl_handle->to_free,&copystr); } break; @@ -793,6 +800,7 @@ { php_curl *curl_handle = (php_curl *)rsrc->ptr; curl_easy_cleanup(curl_handle->cp); + zend_llist_clean(&curl_handle->to_free); efree(curl_handle); } /* }}} */ Index: php_curl.h =================================================================== RCS file: /repository/php4/ext/curl/php_curl.h,v retrieving revision 1.13 diff -u -b -r1.13 php_curl.h --- php_curl.h 2000/10/27 19:10:21 1.13 +++ php_curl.h 2000/11/22 15:38:33 @@ -56,6 +56,7 @@ int cerrno; char error[CURL_ERROR_SIZE+1]; CURL *cp; + zend_llist to_free; } php_curl; typedef struct { If you have no objection to it, I'll apply it. -- Stanislav Malyshev, Zend Products Engineer stas@zend.com http://www.zend.com/ +972-3-6139665 ext.106

« previous php.dev (#38926) next »