- typo

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index dfac09e70e166f66b6274947895d4c4ddd0e86a6..990c008873ec6b7596dac373ab9c3abc35b5dbf7 100644 (file)
--- a/http.c
+++ b/http.c
@@ -44,6 +44,7 @@
 #      include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -84,7 +85,6 @@ function_entry http_functions[] = {
        PHP_FE(http_send_stream, NULL)
        PHP_FE(http_chunked_decode, NULL)
        PHP_FE(http_parse_message, NULL)
-       PHP_FE(http_split_response, NULL)
        PHP_FE(http_parse_headers, NULL)
        PHP_FE(http_get_request_headers, NULL)
        PHP_FE(http_get_request_body, NULL)
@@ -184,6 +184,9 @@ PHP_INI_MH(http_update_allowed_methods)
 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)
+       HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+       HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+       HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
 #ifdef ZEND_ENGINE_2
        HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
@@ -219,6 +222,8 @@ 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;
 }
 /* }}} */
@@ -226,6 +231,7 @@ 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();
@@ -244,6 +250,7 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
+       zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
@@ -251,6 +258,7 @@ 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;
 }
@@ -314,8 +322,8 @@ PHP_MINFO_FUNCTION(http)
                php_info_print_table_row(2, "Custom Request Methods:",
                        PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
 
-               phpstr_free(known_request_methods);
-               phpstr_free(custom_request_methods);
+               phpstr_free(&known_request_methods);
+               phpstr_free(&custom_request_methods);
        }
        php_info_print_table_end();
 #endif