- encodings support exists with ext/zlib too

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index a613b3f0dc9899b9b8fd52c577e5091a2b1c1937..3e8ec02b187f350506a8cda243009795922508c5 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -49,13 +49,13 @@ 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);
@@ -77,9 +77,9 @@ PHP_HTTP_API long _http_support(long feature)
        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