- no need for additional configure argument; just check and enable

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 990c008873ec6b7596dac373ab9c3abc35b5dbf7..dc8d7dd7c44f68bec6d5118320d88a7d25b8cc88 100644 (file)
--- a/http.c
+++ b/http.c
@@ -29,6 +29,7 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
+#include "php_http_cache_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
 #endif
@@ -101,8 +102,6 @@ function_entry http_functions[] = {
        PHP_FE(http_request_method_exists, NULL)
        PHP_FE(http_request_method_name, NULL)
 #endif
-       PHP_FE(http_auth_basic, NULL)
-       PHP_FE(http_auth_basic_cb, NULL)
 #ifndef ZEND_ENGINE_2
        PHP_FE(http_build_query, NULL)
 #endif
@@ -133,9 +132,13 @@ zend_module_entry http_module_entry = {
 int http_module_number;
 
 /* {{{ http_globals */
-static inline void http_globals_init(zend_http_globals *G)
+static void http_globals_init_once(zend_http_globals *G)
 {
        memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
        G->send.buffer_size = HTTP_SENDBUF_SIZE;
        zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 #ifdef HTTP_HAVE_CURL
@@ -148,8 +151,8 @@ static inline void http_globals_init(zend_http_globals *G)
 
 static inline void http_globals_free(zend_http_globals *G)
 {
-       STR_FREE(G->send.content_type);
-       STR_FREE(G->send.unquoted_etag);
+       STR_SET(G->send.content_type, NULL);
+       STR_SET(G->send.unquoted_etag, NULL);
        zend_hash_destroy(&G->request.methods.custom);
 #ifdef HTTP_HAVE_CURL
        zend_llist_clean(&G->request.copies.strings);
@@ -181,6 +184,10 @@ PHP_INI_MH(http_update_allowed_methods)
        return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+#ifndef ZEND_ENGINE_2
+#      define OnUpdateLong OnUpdateInt
+#endif
+
 PHP_INI_BEGIN()
        HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
        HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
@@ -190,6 +197,7 @@ PHP_INI_BEGIN()
 #ifdef ZEND_ENGINE_2
        HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
+       HTTP_PHP_INI_ENTRY("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, etag.mode)
 PHP_INI_END()
 /* }}} */
 
@@ -199,11 +207,13 @@ PHP_MINIT_FUNCTION(http)
 {
        http_module_number = module_number;
 
-#ifdef ZTS
-       ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL)
-#endif
+       ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
 
        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);
 
 #ifdef HTTP_HAVE_CURL
        if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
@@ -214,7 +224,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef ZEND_ENGINE_2
        http_util_object_init();
        http_message_object_init();
+#      ifndef WONKY
        http_response_object_init();
+#      endif
 #      ifdef HTTP_HAVE_CURL
        http_request_object_init();
        http_requestpool_object_init();
@@ -222,8 +234,6 @@ PHP_MINIT_FUNCTION(http)
        http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
-       zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
-       zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
@@ -231,7 +241,6 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
-       zend_hash_destroy(&http_response_statics);
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
        curl_global_cleanup();
@@ -250,7 +259,6 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
-       zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
@@ -258,7 +266,6 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-       zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
 }