Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/curl/interface.c

diff --cc ext/curl/interface.c
index ae490b1c27cdb2b6df910ef2753dc67951b4c88b,1f29e9280d96fa3027bb5fb021db79f883a91083..a2256ef30dcb7479dd2c7dbd547f4c461fdb7174
--- 1/ext/curl/interface.c
--- 2/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;
  }
  /* }}} */