- start thinking about cloning

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index a613b3f0dc9899b9b8fd52c577e5091a2b1c1937..57f9709bcc7c1854785c2349d63161df99acefea 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -47,15 +47,11 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-static zend_bool http_support_ssl;
-
-STATUS _http_support_global_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_support)
 {
-       http_support_ssl = http_request_supports_ssl();
-       
        HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS);
-       HTTP_LONG_CONSTANT("HTTP_SUPPORT_MIMEMAGIC", HTTP_SUPPORT_MIMEMAGIC);
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_MHASHETAGS", HTTP_SUPPORT_MHASHETAGS);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
@@ -69,17 +65,17 @@ PHP_HTTP_API long _http_support(long feature)
        
 #ifdef HTTP_HAVE_CURL
        support |= HTTP_SUPPORT_REQUESTS;
-       if (http_support_ssl) {
-               support |= HTTP_SUPPORT_SSLREQUESTS;
-       }
+#      ifdef HTTP_HAVE_SSL
+       support |= HTTP_SUPPORT_SSLREQUESTS;
+#      endif
 #endif
 #ifdef HTTP_HAVE_MHASH
        support |= HTTP_SUPPORT_MHASHETAGS;
 #endif
 #ifdef HTTP_HAVE_MAGIC
-       support |= HTTP_SUPPORT_MIMEMAGIC;
+       support |= HTTP_SUPPORT_MAGICMIME;
 #endif
-#ifdef HTTP_HAVE_ZLIB
+#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
        support |= HTTP_SUPPORT_ENCODINGS;
 #endif