X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b14befebaee917925b89edb31ced7549a479eefd;hp=97899774f9f3a764f325d053bf076ecbb1476c0b;hb=ff17beb99d61462cf1791eecdb3f68dbd2aea5e5;hpb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79

diff --git a/http.c b/http.c
index 9789977..b14befe 100644
--- a/http.c
+++ b/http.c
@@ -224,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));
 			}
 		}
@@ -250,6 +250,11 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
+/* {{{ SSL */
+#ifdef HTTP_NEED_SSL
+
+#endif
+/* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
@@ -260,12 +265,11 @@ 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;
+	}
 #ifdef HTTP_HAVE_CURL
-	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+	if (SUCCESS != http_request_global_init()) {
 		return FAILURE;
 	}
 #endif /* HTTP_HAVE_CURL */
@@ -292,7 +296,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	curl_global_cleanup();
+	http_request_global_cleanup();
 #endif
 	return SUCCESS;
 }