diff options
| -rw-r--r-- | ext/openssl/openssl.c | 7 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 8 | ||||
| -rw-r--r-- | ext/standard/file.c | 2 | ||||
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 2 | ||||
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_fopen_wrappers.h | 4 |
6 files changed, 11 insertions, 14 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 7fc9da3f5d..b48d0909d6 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -30,6 +30,7 @@ /* PHP Includes */ #include "ext/standard/file.h" #include "ext/standard/info.h" +#include "ext/standard/php_fopen_wrappers.h" /* OpenSSL includes */ #include <openssl/evp.h> @@ -614,6 +615,9 @@ PHP_MINIT_FUNCTION(openssl) /* override the default tcp socket provider */ php_stream_xport_register("tcp", php_openssl_ssl_socket_factory TSRMLS_CC); + + php_register_url_stream_wrapper("https", &php_stream_http_wrapper TSRMLS_CC); + php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper TSRMLS_CC); return SUCCESS; } @@ -636,6 +640,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl) { EVP_cleanup(); + php_unregister_url_stream_wrapper("https" TSRMLS_CC); + php_unregister_url_stream_wrapper("ftps" TSRMLS_CC); + php_stream_xport_unregister("ssl" TSRMLS_CC); php_stream_xport_unregister("tls" TSRMLS_CC); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 84c1347f50..56d25da5e2 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1107,10 +1107,6 @@ PHP_MINIT_FUNCTION(basic) #ifndef PHP_CURL_URL_WRAPPERS php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC); php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper TSRMLS_CC); -# if HAVE_OPENSSL_EXT - php_register_url_stream_wrapper("https", &php_stream_http_wrapper TSRMLS_CC); - php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper TSRMLS_CC); -# endif #endif #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) @@ -1135,10 +1131,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) #ifndef PHP_CURL_URL_WRAPPERS php_unregister_url_stream_wrapper("http" TSRMLS_CC); php_unregister_url_stream_wrapper("ftp" TSRMLS_CC); -# if HAVE_OPENSSL_EXT - php_unregister_url_stream_wrapper("https" TSRMLS_CC); - php_unregister_url_stream_wrapper("ftps" TSRMLS_CC); -# endif #endif UNREGISTER_INI_ENTRIES(); diff --git a/ext/standard/file.c b/ext/standard/file.c index 9da076e08a..18a4bb6480 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2246,8 +2246,6 @@ PHP_FUNCTION(unlink) PHP_NAMED_FUNCTION(php_if_ftruncate) { zval **fp , **size; - short int ret; - int fd; php_stream *stream; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &fp, &size) == FAILURE) { diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 192786058d..e088413187 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -123,7 +123,7 @@ static php_stream_wrapper_ops ftp_stream_wops = { "FTP" }; -php_stream_wrapper php_stream_ftp_wrapper = { +PHPAPI php_stream_wrapper php_stream_ftp_wrapper = { &ftp_stream_wops, NULL, 1 /* is_url */ diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index dbe7340a9a..f3d9c95aa7 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -455,7 +455,7 @@ static php_stream_wrapper_ops http_stream_wops = { "HTTP" }; -php_stream_wrapper php_stream_http_wrapper = { +PHPAPI php_stream_wrapper php_stream_http_wrapper = { &http_stream_wops, NULL, 1 /* is_url */ diff --git a/ext/standard/php_fopen_wrappers.h b/ext/standard/php_fopen_wrappers.h index fe92880ed6..5446ac9971 100644 --- a/ext/standard/php_fopen_wrappers.h +++ b/ext/standard/php_fopen_wrappers.h @@ -25,8 +25,8 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); php_stream *php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); -extern php_stream_wrapper php_stream_http_wrapper; -extern php_stream_wrapper php_stream_ftp_wrapper; +PHPAPI php_stream_wrapper php_stream_http_wrapper; +PHPAPI php_stream_wrapper php_stream_ftp_wrapper; extern php_stream_wrapper php_stream_php_wrapper; #endif |