From: Michael Wallner <mike@php.net>
Date: Thu, 20 Oct 2005 15:30:46 +0000 (+0000)
Subject: - http_support() claimed there's no SSL support ifndef ZTS
X-Git-Tag: RELEASE_0_17_0~28
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=20e6f54b9dba78fec83ad8141034116edc4c84d3

- http_support() claimed there's no SSL support ifndef ZTS
---

diff --git a/http_api.c b/http_api.c
index 3e8ec02..57f9709 100644
--- a/http_api.c
+++ b/http_api.c
@@ -47,12 +47,8 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-static zend_bool http_support_ssl;
-
 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_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
@@ -69,9 +65,9 @@ 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;
diff --git a/http_request_api.c b/http_request_api.c
index 1acd53a..85bbb17 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -984,15 +984,6 @@ static inline void _http_curl_defaults(CURL *ch)
 
 #endif /* HTTP_HAVE_CURL */
 
-zend_bool _http_request_supports_ssl(void)
-{
-#ifdef HTTP_NEED_SSL
-	return (zend_bool) 1;
-#else
-	return (zend_bool) 0;
-#endif
-}
-
 /*
  * Local variables:
  * tab-width: 4
diff --git a/php_http.h b/php_http.h
index 356b78a..c1bca86 100644
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.16.0"
+#define HTTP_PEXT_VERSION "0.16.1dev"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
diff --git a/php_http_request_api.h b/php_http_request_api.h
index 9a24b3c..b80e42b 100644
--- a/php_http_request_api.h
+++ b/php_http_request_api.h
@@ -18,10 +18,6 @@
 #ifndef PHP_HTTP_REQUEST_API_H
 #define PHP_HTTP_REQUEST_API_H
 
-#define http_request_supports_ssl() _http_request_supports_ssl()
-extern zend_bool _http_request_supports_ssl(void);
-
-
 #ifdef HTTP_HAVE_CURL
 
 #include "php_http_std_defs.h"