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

diff --git a/http_api.c b/http_api.c
index 3e8ec02b187f350506a8cda243009795922508c5..57f9709bcc7c1854785c2349d63161df99acefea 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -47,12 +47,8 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 

-static zend_bool http_support_ssl;
-

 PHP_MINIT_FUNCTION(http_support)
 {
 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);
        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;
        
 #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_MHASH
        support |= HTTP_SUPPORT_MHASHETAGS;

diff --git a/http_request_api.c b/http_request_api.c
index 1acd53ad57044625eecd98d50c85a2ee73d1ff3f..85bbb17fde292ab6bb5daabf55f1d7728474b92b 100644 (file)
--- 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 */
 
 
 #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
 /*
  * Local variables:
  * tab-width: 4

diff --git a/php_http.h b/php_http.h
index 356b78a0ebbd17e5f670856ce6c4df8ebb7e086c..c1bca868f3a57929dd8ce052468ff3b739eb05d8 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #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
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL

diff --git a/php_http_request_api.h b/php_http_request_api.h
index 9a24b3c7ebf0e795fa1d82939be2fdf279ecd5cc..b80e42b92637d59e4e8ecdeeb730b7f55c26a083 100644 (file)
--- 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
 
 #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"
 #ifdef HTTP_HAVE_CURL
 
 #include "php_http_std_defs.h"