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: | Pierre Joye | Date: | Thu, 22 Apr 2010 08:58:07 +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-62337@lists.php.net to get a copy of this message | ||
pajoye Thu, 22 Apr 2010 08:58:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298299
Log:
- Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading
Bug: http://bugs.php.net/51629 (Open) CURLOPT_FOLLOWLOCATION
error message is misleading
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 2010-04-22 07:14:06 UTC (rev 298298)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-04-22 08:58:07 UTC (rev 298299)
@@ -12,6 +12,8 @@
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
+- Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading).
+ (Pierre)
- Fixed bug #51617 (PDO PGSQL still broken against PostGreSQL < 7.4).
(Felipe, wdierkes at 5dollarwhitebox dot org)
- Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2010-04-22 07:14:06 UTC (rev 298298)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2010-04-22 08:58:07 UTC (rev 298299)
@@ -1386,7 +1386,7 @@
convert_to_long_ex(zvalue);
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
if (Z_LVAL_PP(zvalue) != 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when in safe_mode or an open_basedir is set");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when safe_mode is enabled 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 2010-04-22 07:14:06 UTC (rev 298298)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-22 08:58:07 UTC (rev 298299)
@@ -21,6 +21,8 @@
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)
+- Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading).
+ (Pierre)
- Fixed bug #51627 (script path not correctly evaluated).
(russell dot tempero at rightnow dot com)
- Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2010-04-22 07:14:06 UTC (rev 298298)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2010-04-22 08:58:07 UTC (rev 298299)
@@ -1678,7 +1678,7 @@
convert_to_long_ex(zvalue);
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
if (Z_LVAL_PP(zvalue) != 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when in safe_mode or an open_basedir is set");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when safe_mode is enabled 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 2010-04-22 07:14:06 UTC (rev 298298)
+++ php/php-src/trunk/ext/curl/interface.c 2010-04-22 08:58:07 UTC (rev 298299)
@@ -1676,7 +1676,7 @@
convert_to_long_ex(zvalue);
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
if (Z_LVAL_PP(zvalue) != 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when in safe_mode or an open_basedir is set");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when safe_mode is enabled or an open_basedir is set");
RETVAL_FALSE;
return 1;
}