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: | Ilia Alshanetsky | Date: | Tue, 02 Mar 2010 12:54:23 +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-61942@lists.php.net to get a copy of this message | ||
iliaa Tue, 02 Mar 2010 12:54:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295731
Log:
Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when an invalid option is
provided)
Bug: http://bugs.php.net/51171 (error getting bug
information)
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-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-03-02 12:54:23 UTC (rev 295731)
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2010, PHP 5.2.14
+- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
+ an invalid option is provided). (Ilia)
25 Feb 2010, PHP 5.2.13
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2010-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2010-03-02 12:54:23 UTC (rev 295731)
@@ -1772,6 +1772,10 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
convert_to_long_ex(zoption);
+ if (Z_LVAL_PP(zoption) <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option");
+ RETURN_FALSE;
+ }
if (!_php_curl_setopt(ch, Z_LVAL_PP(zoption), zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-03-02 12:54:23 UTC (rev 295731)
@@ -6,6 +6,8 @@
- Added stream filter support to mcrypt extension (ported from
mcrypt_filter). (Stas)
+- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
+ an invalid option is provided). (Ilia)
?? ??? 20??, PHP 5.3.2
- Upgraded bundled sqlite to version 3.6.22. (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-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2010-03-02 12:54:23 UTC (rev 295731)
@@ -2095,6 +2095,11 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
+ if (options <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option");
+ RETURN_FALSE;
+ }
+
if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {
Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c 2010-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/trunk/ext/curl/interface.c 2010-03-02 12:54:23 UTC (rev 295731)
@@ -2164,6 +2164,11 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
+ if (options <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option");
+ RETURN_FALSE;
+ }
+
if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {