From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Apr 2013 11:31:14 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01ca2bf8c3f694c3637a161a5d68f3c947a22c08;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/curl/interface.c
---

01ca2bf8c3f694c3637a161a5d68f3c947a22c08
diff --cc ext/curl/interface.c
index ae490b1c27,1f29e9280d..a2256ef30d
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1222,7 -914,8 +1222,7 @@@ PHP_MINIT_FUNCTION(curl
  	}
  
  #ifdef PHP_CURL_URL_WRAPPERS
- 	REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS | CONST_PERSISTENT);
+ 	REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLED", 1, CONST_CS | CONST_PERSISTENT);
 -# if HAVE_CURL_VERSION_INFO
  	{
  		curl_version_info_data *info = curl_version_info(CURLVERSION_NOW);
  		char **p = (char **)info->protocols;
@@@ -1236,12 -929,22 +1236,12 @@@
  			(void) *p++;
  		}
  	}
 -# else
 -	php_unregister_url_stream_wrapper("http");
 -	php_register_url_stream_wrapper("http", &php_curl_wrapper TSRMLS_CC);
 -	php_unregister_url_stream_wrapper("https");
 -	php_register_url_stream_wrapper("https", &php_curl_wrapper TSRMLS_CC);
 -	php_unregister_url_stream_wrapper("ftp");
 -	php_register_url_stream_wrapper("ftp", &php_curl_wrapper TSRMLS_CC);
 -	php_unregister_url_stream_wrapper("ftps");
 -	php_register_url_stream_wrapper("ftps", &php_curl_wrapper TSRMLS_CC);
 -	php_unregister_url_stream_wrapper("ldap");
 -	php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC);
 -# endif
  #else
- 	REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS | CONST_PERSISTENT);
+ 	REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLED", 0, CONST_CS | CONST_PERSISTENT);
  #endif
  
 +	curlfile_register_class(TSRMLS_C);
 +
  	return SUCCESS;
  }
  /* }}} */