jani Wed Dec 17 14:13:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c php_curl.h
Log:
MFH:- Fixed bug #45161 (Reusing a curl handle leaks memory)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.24&r2=1.62.2.14.2.27.2.25&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.25
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24 Tue Dec 9 17:17:27 2008
+++ php-src/ext/curl/interface.c Wed Dec 17 14:13:40 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.24 2008/12/09 17:17:27 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.25 2008/12/17 14:13:40 jani Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1098,6 +1098,7 @@
/* }}} */
#endif
+#if LIBCURL_VERSION_NUM < 0x071101
/* {{{ curl_free_string
*/
static void curl_free_string(void **string)
@@ -1105,6 +1106,7 @@
efree(*string);
}
/* }}} */
+#endif
/* {{{ curl_free_post
*/
@@ -1179,7 +1181,9 @@
memset(&(*ch)->err, 0, sizeof((*ch)->err));
+#if LIBCURL_VERSION_NUM < 0x071101
zend_llist_init(&(*ch)->to_free.str, sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
+#endif
zend_llist_init(&(*ch)->to_free.slist, sizeof(struct curl_slist),
(llist_dtor_func_t) curl_free_slist, 0);
zend_llist_init(&(*ch)->to_free.post, sizeof(struct HttpPost),
(llist_dtor_func_t) curl_free_post, 0);
}
@@ -1237,11 +1241,15 @@
#endif
if (url) {
+#if LIBCURL_VERSION_NUM >= 0x071100
+ curl_easy_setopt(ch->cp, CURLOPT_URL, url);
+#else
char *urlcopy;
urlcopy = estrndup(url, url_len);
curl_easy_setopt(ch->cp, CURLOPT_URL, urlcopy);
zend_llist_add_element(&ch->to_free.str, &urlcopy);
+#endif
}
ZEND_REGISTER_RESOURCE(return_value, ch, le_curl);
@@ -1308,9 +1316,11 @@
curl_easy_setopt(dupch->cp, CURLOPT_INFILE, (void *) dupch);
curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER, (void *) dupch);
+#if LIBCURL_VERSION_NUM < 0x071101
zend_llist_copy(&dupch->to_free.str, &ch->to_free.str);
/* Don't try to free copied strings, they're free'd when the original
handle is destroyed */
dupch->to_free.str.dtor = NULL;
+#endif
zend_llist_copy(&dupch->to_free.slist, &ch->to_free.slist);
zend_llist_copy(&dupch->to_free.post, &ch->to_free.post);
@@ -1433,7 +1443,9 @@
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
case CURLOPT_ENCODING: {
+#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
+#endif
convert_to_string_ex(zvalue);
@@ -1441,9 +1453,14 @@
PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
}
+#if LIBCURL_VERSION_NUM >= 0x071100
+ /* Strings passed to libcurl as âchar *â arguments,
are copied by the library... NOTE: before 7.17.0 strings were not copied. */
+ error = curl_easy_setopt(ch->cp, option,
Z_STRVAL_PP(zvalue));
+#else
copystr = estrndup(Z_STRVAL_PP(zvalue),
Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch->cp, option, copystr);
zend_llist_add_element(&ch->to_free.str, ©str);
+#endif
break;
}
@@ -1634,6 +1651,11 @@
error = curl_easy_setopt(ch->cp,
CURLOPT_HTTPPOST, first);
} else {
+#if LIBCURL_VERSION_NUM >= 0x071101
+ /* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
+ error = curl_easy_setopt(ch->cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
+ error = curl_easy_setopt(ch->cp,
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
+#else
char *post = NULL;
convert_to_string_ex(zvalue);
@@ -1642,6 +1664,7 @@
error = curl_easy_setopt(ch->cp,
CURLOPT_POSTFIELDS, post);
error = curl_easy_setopt(ch->cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
+#endif
}
break;
case CURLOPT_HTTPHEADER:
@@ -1663,20 +1686,15 @@
zend_hash_get_current_data(ph, (void **)
¤t) == SUCCESS;
zend_hash_move_forward(ph)
) {
- char *indiv = NULL;
-
SEPARATE_ZVAL(current);
convert_to_string_ex(current);
- indiv = estrndup(Z_STRVAL_PP(current),
Z_STRLEN_PP(current) + 1);
- slist = curl_slist_append(slist, indiv);
+ slist = curl_slist_append(slist,
Z_STRVAL_PP(current));
if (!slist) {
- efree(indiv);
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Could not build curl_slist");
RETVAL_FALSE;
return 1;
}
- zend_llist_add_element(&ch->to_free.str,
&indiv);
}
zend_llist_add_element(&ch->to_free.slist, &slist);
@@ -1691,7 +1709,9 @@
case CURLOPT_SSLCERT:
case CURLOPT_RANDOM_FILE:
case CURLOPT_COOKIEFILE: {
+#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
+#endif
convert_to_string_ex(zvalue);
@@ -1700,11 +1720,14 @@
return 1;
}
+#if LIBCURL_VERSION_NUM >= 0x071100
+ error = curl_easy_setopt(ch->cp, option,
Z_STRVAL_PP(zvalue));
+#else
copystr = estrndup(Z_STRVAL_PP(zvalue),
Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch->cp, option, copystr);
zend_llist_add_element(&ch->to_free.str, ©str);
-
+#endif
break;
}
case CURLINFO_HEADER_OUT:
@@ -2068,7 +2091,9 @@
#endif
curl_easy_cleanup(ch->cp);
+#if LIBCURL_VERSION_NUM < 0x071101
zend_llist_clean(&ch->to_free.str);
+#endif
zend_llist_clean(&ch->to_free.slist);
zend_llist_clean(&ch->to_free.post);
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/php_curl.h?r1=1.44.2.2.2.2.2.1&r2=1.44.2.2.2.2.2.2&diff_format=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.1
php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.2
--- php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.1 Mon Dec 31 07:17:06 2007
+++ php-src/ext/curl/php_curl.h Wed Dec 17 14:13:40 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.44.2.2.2.2.2.1 2007/12/31 07:17:06 sebastian Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.2.2.2 2008/12/17 14:13:40 jani Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -114,7 +114,9 @@
};
struct _php_curl_free {
+#if LIBCURL_VERSION_NUM < 0x071100
zend_llist str;
+#endif
zend_llist post;
zend_llist slist;
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
