- add etag generation through mhash

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 444341e634a03e3e10480a302cd89aa813606a7f..1c901d17ed541a9c0043aea10214fe8ae72a9408 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
@@ -44,6 +45,7 @@
 #      include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -189,6 +191,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()
 /* }}} */
 
@@ -203,6 +206,10 @@ PHP_MINIT_FUNCTION(http)
 #endif
 
        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)) {
@@ -221,8 +228,10 @@ PHP_MINIT_FUNCTION(http)
        http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
+#ifdef 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);
+#endif
        return SUCCESS;
 }
 /* }}} */
@@ -257,7 +266,9 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+#ifdef ZEND_ENGINE_2
        zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
+#endif
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
 }