com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/curl/interface.c
| From: | Xinchen Hui | Date: | Mon, 09 Jul 2012 00:38:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69542@lists.php.net to get a copy of this message | ||
Commit: 0398cc22a9fda50ad9ba0fb2d717f07a711e1732
Author: Xinchen Hui <laruence@php.net> Mon, 9 Jul 2012 08:38:03 +0800
Parents: 5910d8d4f499bf84bcaa1161bd0b89c15a19a304 c819cf9d6bd43d79b894f1d0f0c6c282893fd9bd
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0398cc22a9fda50ad9ba0fb2d717f07a711e1732
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
Conflicts:
ext/curl/interface.c
Bugs:
https://bugs.php.net/62499
Changed paths:
MM ext/curl/interface.c
Diff:
diff --cc ext/curl/interface.c
index b03f346,94be60f..d7d5c51
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -2177,7 -2167,7 +2177,7 @@@ string_copy
convert_to_string_ex(zvalue);
- if (!Z_STRLEN_PP(zvalue) || php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
- if ((Z_STRLEN_PP(zvalue) && php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) ||
(PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+",
CHECKUID_CHECK_MODE_PARAM))) {
++ if (Z_STRLEN_PP(zvalue) && php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
RETVAL_FALSE;
return 1;
}