X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=528f8bad300a77dac1dfaaaa6c5fbf19abc835fe;hp=06c32241e66db349246e829a5be613a0ca9d2cb7;hb=5efb94c93bc4c1d4873706958962acc4313477f3;hpb=10025ba0ed0c9c8a509441ad1b9d6db633af8596

diff --git a/http.c b/http.c
index 06c3224..528f8ba 100644
--- a/http.c
+++ b/http.c
@@ -52,14 +52,6 @@
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
-#	if defined(ZTS) && defined(HTTP_HAVE_SSL)
-#		if !defined(HAVE_OPENSSL_CRYPTO_H)
-#			error "libcurl was compiled with OpenSSL support, but we have no crypto.h"
-#		else
-#			define HTTP_NEED_SSL
-#			include <openssl/crypto.h>
-#		endif
-#	endif
 #	ifdef PHP_WIN32
 #		include <winsock2.h>
 #	endif
@@ -232,7 +224,7 @@ PHP_INI_DISP(http_etag_mode_displayer)
 			if (!hash_name) {
 				ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
 			} else {
-				ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_"));
+				ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
 				ZEND_WRITE(hash_name, strlen(hash_name));
 			}
 		}
@@ -258,49 +250,6 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
-/* {{{ SSL */
-#ifdef HTTP_NEED_SSL
-
-static MUTEX_T *http_ssl_mutex = NULL;
-
-static void http_ssl_lock(int mode, int n, const char * file, int line)
-{
-	if (mode & CRYPTO_LOCK) {
-		tsrm_mutex_lock(http_ssl_mutex[n]);
-	} else {
-		tsrm_mutex_unlock(http_ssl_mutex[n]);
-	}
-}
-static unsigned long http_ssl_id(void)
-{
-	return (unsigned long) tsrm_thread_id();
-}
-static inline void http_ssl_init(void)
-{
-	int i, c = CRYPTO_num_locks();
-	http_ssl_mutex = malloc(c * sizeof(MUTEX_T));
-	
-	for (i = 0; i < c; ++i) {
-		http_ssl_mutex[i] = tsrm_mutex_alloc();
-	}
-	
-	CRYPTO_set_id_callback(http_ssl_id);
-	CRYPTO_set_locking_callback(http_ssl_lock);
-}
-static inline void http_ssl_cleanup(void)
-{
-	int i, c = CRYPTO_num_locks();
-	
-	CRYPTO_set_id_callback(NULL);
-	CRYPTO_set_locking_callback(NULL);
-	
-	for (i = 0; i < c; ++i) {
-		tsrm_mutex_free(http_ssl_mutex[i]);
-	}
-}
-#endif
-/* }}} */
-
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
 {
@@ -310,19 +259,14 @@ PHP_MINIT_FUNCTION(http)
 
 	REGISTER_INI_ENTRIES();
 	
-	HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
-	HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
-
+	if (SUCCESS != http_cache_global_init()) {
+		return FAILURE;
+	}
+	if (SUCCESS != http_request_method_global_init()) {
+		return FAILURE;
+	}
 #ifdef HTTP_HAVE_CURL
-	if (CURLE_OK == curl_global_init(CURL_GLOBAL_ALL)) {
-#	ifdef HTTP_NEED_SSL
-		curl_version_info_data *cvid = curl_version_info(CURLVERSION_NOW);
-		if (cvid && (cvid->features & CURL_VERSION_SSL)) {
-			http_ssl_init();
-		}
-#	endif
-	} else {
+	if (SUCCESS != http_request_global_init()) {
 		return FAILURE;
 	}
 #endif /* HTTP_HAVE_CURL */
@@ -349,12 +293,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	curl_global_cleanup();
-#	ifdef HTTP_NEED_SSL
-	if (http_ssl_mutex) {
-		http_ssl_cleanup();
-	}
-#	endif
+	http_request_global_cleanup();
 #endif
 	return SUCCESS;
 }
@@ -377,6 +316,13 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+	int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+	
+	for (i = 0; i < c; ++i) {
+		http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+	}
+#endif
 	http_globals_free(HTTP_GLOBALS);
 	return SUCCESS;
 }