diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-03 10:17:49 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-03 10:17:49 +0800 |
| commit | bd6a90dac7b759908e8d36fc34f9e8b5a4fd9ce8 (patch) | |
| tree | 96c627998d83ed1903591cfabce453fd04570684 /ext/curl | |
| parent | db037caf18244f1917a553af0b69d9f01082f38d (diff) | |
| parent | bb7017632800feebdb0123781561aafa743d082e (diff) | |
| download | php-git-bd6a90dac7b759908e8d36fc34f9e8b5a4fd9ce8.tar.gz | |
Merge branch 'PHP-5.5'
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 5bd1b479e2..4501051594 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1222,6 +1222,7 @@ PHP_MINIT_FUNCTION(curl) } #ifdef PHP_CURL_URL_WRAPPERS + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS | CONST_PERSISTENT); { curl_version_info_data *info = curl_version_info(CURLVERSION_NOW); char **p = (char **)info->protocols; @@ -1235,6 +1236,8 @@ PHP_MINIT_FUNCTION(curl) (void) *p++; } } +#else + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS | CONST_PERSISTENT); #endif curlfile_register_class(TSRMLS_C); |