svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c
trunk/ext/curl/interface.c
| From: | Felipe Pena | Date: | Wed, 23 Sep 2009 02:08:19 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60487@lists.php.net to get a copy of this message | ||
felipe Wed, 23 Sep 2009 02:08:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288598
Log:
- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE cannot be set
...")
Bug: http://bugs.php.net/49531 (Open) CURLOPT_INFILESIZE
sometimes causes warning "CURLPROTO_FILE cannot be set"
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/curl/interface.c
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_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-09-23 00:18:32 UTC (rev 288597)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-09-23 02:08:19 UTC (rev 288598)
@@ -3,6 +3,8 @@
?? ??? ????, PHP 5.2.12
- Fixed bug #49630 (imap_listscan function missing). (Felipe)
- Fixed bug #49578 (make install-pear fails). (Hannes)
+- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE
+ cannot be set"). (Felipe)
17 Sep 2009, PHP 5.2.11
- Fixed certificate validation inside php_openssl_apply_verification_policy.
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-23 00:18:32 UTC (rev 288597)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-23 02:08:19 UTC (rev 288598)
@@ -1361,7 +1361,8 @@
#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM >= 0x71304
- if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
(Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
+ if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
+ ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
(Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when in
safe_mode or an open_basedir is set");
RETVAL_FALSE;
return 1;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-09-23 00:18:32 UTC (rev 288597)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-09-23 02:08:19 UTC (rev 288598)
@@ -7,6 +7,8 @@
(Linus Nielsen Feltzing <linus@haxx.se>)
- Fixed bug #49630 (imap_listscan function missing). (Felipe)
+- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE
+ cannot be set"). (Felipe)
?? ??? 2009, PHP 5.3.1RC? <- WHY IS THIS HERE? Gonna be released after 5.3.1 or what??
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-23 00:18:32 UTC (rev 288597)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-23 02:08:19 UTC (rev 288598)
@@ -1649,7 +1649,8 @@
#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM >= 0x71304
- if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
(Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
+ if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
+ ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
(Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when in
safe_mode or an open_basedir is set");
RETVAL_FALSE;
return 1;
Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c 2009-09-23 00:18:32 UTC (rev 288597)
+++ php/php-src/trunk/ext/curl/interface.c 2009-09-23 02:08:19 UTC (rev 288598)
@@ -1665,7 +1665,8 @@
#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM >= 0x71304
- if ((PG(open_basedir) && *PG(open_basedir)) && (Z_LVAL_PP(zvalue) &
CURLPROTO_FILE)) {
+ if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
+ (PG(open_basedir) && *PG(open_basedir)) && (Z_LVAL_PP(zvalue) &
CURLPROTO_FILE)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when
open_basedir is set");
RETVAL_FALSE;
return 1;