iliaa Mon, 29 Nov 2010 14:40:59 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305835
Log: Fixed bug #52828 (curl_setopt does not accept persistent streams). Bug: http://bugs.php.net/52828 (Open) curl_setopt does not accept persistent streams Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/curl/interface.c U php/php-src/trunk/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-11-29 14:39:00 UTC (rev 305834) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-29 14:40:59 UTC (rev 305835) @@ -14,6 +14,10 @@ (Ilia) . Fixed #53409 (sleep() returns NULL on Windows). (Pierre) +- Curl extension: + . Fixed bug #52828 (curl_setopt does not accept persistent streams). + (Gustavo, Ilia) + - Hash extension: . Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c). (Mike, Ilia) Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2010-11-29 14:39:00 UTC (rev 305834) +++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2010-11-29 14:40:59 UTC (rev 305835) @@ -1761,7 +1761,7 @@ int type; void * what; - what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream()); + what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream(), php_file_le_pstream()); if (!what) { RETVAL_FALSE; return 1; Modified: php/php-src/trunk/ext/curl/interface.c =================================================================== --- php/php-src/trunk/ext/curl/interface.c 2010-11-29 14:39:00 UTC (rev 305834) +++ php/php-src/trunk/ext/curl/interface.c 2010-11-29 14:40:59 UTC (rev 305835) @@ -1771,7 +1771,7 @@ int type; void * what; - what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream()); + what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream(), php_file_le_pstream()); if (!what) { RETVAL_FALSE; return 1;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
