pajoye Sat, 10 Oct 2009 09:17:01 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289494
Log: - Merge: Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning ?\226?\128?\156CURLPROTO_FILE cannot be set ?\226?\128?\166) Bug: http://bugs.php.net/49531 (Closed) CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE cannot be set" Changed paths: U php/php-src/branches/PHP_5_3_1/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_3_1/ext/curl/interface.c =================================================================== --- php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:12:58 UTC (rev 289493) +++ php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:17:01 UTC (rev 289494) @@ -1563,7 +1563,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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
