From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Jul 2012 00:38:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.6RC1~69^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0398cc22a9fda50ad9ba0fb2d717f07a711e1732;p=php

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
---

0398cc22a9fda50ad9ba0fb2d717f07a711e1732
diff --cc ext/curl/interface.c
index b03f346b59,94be60fd5d..d7d5c51c4d
--- 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;
  			}