iliaa Sun Jun 26 13:31:08 2005 EDT
Modified files:
/php-src NEWS
/php-src/ext/curl multi.c interface.c
Log:
Fixed bug #33475 (cURL handle is not closed on curl_close().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1959&r2=1.1960&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1959 php-src/NEWS:1.1960
--- php-src/NEWS:1.1959 Fri Jun 24 15:45:59 2005
+++ php-src/NEWS Sun Jun 26 13:31:06 2005
@@ -3,6 +3,7 @@
?? ??? 2005, PHP 5.1 Beta 3
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql, to toggle
usage of buffered queries.
+- Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
- Fixed bug #32660 (Assignment by reference causes crash when field access is
overloaded (__get)). (Dmitry)
- Fixed bug #30828 (debug_backtrace() reports incorrect class in overridden
http://cvs.php.net/diff.php/php-src/ext/curl/multi.c?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.17 php-src/ext/curl/multi.c:1.18
--- php-src/ext/curl/multi.c:1.17 Fri Sep 10 16:36:45 2004
+++ php-src/ext/curl/multi.c Sun Jun 26 13:31:07 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: multi.c,v 1.17 2004/09/10 20:36:45 sterling Exp $ */
+/* $Id: multi.c,v 1.18 2005/06/26 17:31:07 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -112,6 +112,8 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, &z_ch, -1, le_curl_name, le_curl);
zval_ptr_dtor(&z_ch);
+
+ --ch->uses;
RETURN_LONG((long) curl_multi_remove_handle(mh->multi, ch->cp));
}
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.57&r2=1.58&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.57 php-src/ext/curl/interface.c:1.58
--- php-src/ext/curl/interface.c:1.57 Thu Jun 2 17:04:12 2005
+++ php-src/ext/curl/interface.c Sun Jun 26 13:31:07 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.57 2005/06/02 21:04:12 tony2001 Exp $ */
+/* $Id: interface.c,v 1.58 2005/06/26 17:31:07 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1291,12 +1291,13 @@
ch->uses++;
if (ch->handlers->write->method == PHP_CURL_RETURN &&
ch->handlers->write->buf.len > 0) {
+ --ch->uses;
if (ch->handlers->write->type != PHP_CURL_BINARY) {
smart_str_0(&ch->handlers->write->buf);
}
RETURN_STRINGL(ch->handlers->write->buf.c,
ch->handlers->write->buf.len, 0);
}
-
+ --ch->uses;
RETURN_TRUE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
