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

diff --cc ext/curl/interface.c
index b03f346b59b40252a8c5ad27a38c5d1f3d31d82c,94be60fd5d5a78e19ecafdc92b191752ef502b10..d7d5c51c4d01d31fe0e0ac8afa9a98957fc837d5
--- 1/ext/curl/interface.c
--- 2/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;
                        }