iliaa Thu Jul 2 13:42:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
/php-src NEWS
Log:
MFB: Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns
on files that have been opened with r+).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.58&r2=1.62.2.14.2.27.2.59&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.58
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.59
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.58 Sun Jun 28 09:50:14 2009
+++ php-src/ext/curl/interface.c Thu Jul 2 13:42:16 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.58 2009/06/28 09:50:14 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.59 2009/07/02 13:42:16 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1649,7 +1649,7 @@
error = CURLE_OK;
switch (option) {
case CURLOPT_FILE:
- if (((php_stream *) what)->mode[0] !=
'r') {
+ if (((php_stream *) what)->mode[0] !=
'r' || ((php_stream *) what)->mode[1] == '+') {
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write->fp = fp;
ch->handlers->write->method =
PHP_CURL_FILE;
@@ -1660,7 +1660,7 @@
}
break;
case CURLOPT_WRITEHEADER:
- if (((php_stream *) what)->mode[0] !=
'r') {
+ if (((php_stream *) what)->mode[0] !=
'r' || ((php_stream *) what)->mode[1] == '+') {
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write_header->fp
= fp;
ch->handlers->write_header->method = PHP_CURL_FILE;
@@ -1676,7 +1676,7 @@
ch->handlers->read->fd =
Z_LVAL_PP(zvalue);
break;
case CURLOPT_STDERR:
- if (((php_stream *) what)->mode[0] !=
'r') {
+ if (((php_stream *) what)->mode[0] !=
'r' || ((php_stream *) what)->mode[1] == '+') {
if (ch->handlers->std_err) {
zval_ptr_dtor(&ch->handlers->std_err);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.661&r2=1.2027.2.547.2.965.2.662&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.661
php-src/NEWS:1.2027.2.547.2.965.2.662
--- php-src/NEWS:1.2027.2.547.2.965.2.661 Wed Jul 1 17:38:52 2009
+++ php-src/NEWS Thu Jul 2 13:42:16 2009
@@ -6,6 +6,8 @@
Functors. (Christian Seiler)
- Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
+- Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
+ files that have been opened with r+). (Ilia)
- Fixed bug #48681 (openssl signature verification for tar archives broken).
(Greg)
- Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
