X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_env.c;h=fdbdd92ee97ae08e9d7df7966737d43dc92a2f97;hb=fd7a7d76453ead2dfe292fb2f6cb0228ec360a67;hp=21bd89ab73d504a51a7c08ffe0a3dfec095bd7ca;hpb=650b04d44f7ab3a5325865d9ffa10a5245ac7eca;p=m6w6%2Fext-http

diff --git a/src/php_http_env.c b/src/php_http_env.c
index 21bd89a..fdbdd92 100644
--- a/src/php_http_env.c
+++ b/src/php_http_env.c
@@ -15,6 +15,12 @@
 
 
 PHP_RSHUTDOWN_FUNCTION(http_env)
+{
+	php_http_env_reset();
+	return SUCCESS;
+}
+
+void php_http_env_reset()
 {
 	if (PHP_HTTP_G->env.request.headers) {
 		zend_hash_destroy(PHP_HTTP_G->env.request.headers);
@@ -24,13 +30,10 @@ PHP_RSHUTDOWN_FUNCTION(http_env)
 	if (PHP_HTTP_G->env.request.body) {
 		php_http_message_body_free(&PHP_HTTP_G->env.request.body);
 	}
-
 	if (PHP_HTTP_G->env.server_var) {
 		zval_ptr_dtor(PHP_HTTP_G->env.server_var);
 		PHP_HTTP_G->env.server_var = NULL;
 	}
-
-	return SUCCESS;
 }
 
 void php_http_env_get_request_headers(HashTable *headers)
@@ -501,7 +504,7 @@ ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const ch
 				return FAILURE;
 			}
 			h.response_code = http_code;
-			h.line_len = spprintf(&h.line, 0, "%.*s: %.*s", (int) name_len, name_str, data->len, data->val);
+			h.line_len = spprintf(&h.line, 0, "%s: %s", name_str, data->val);
 
 			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
 
@@ -774,6 +777,15 @@ static PHP_METHOD(HttpEnv, negotiate)
 	}
 }
 
+ZEND_BEGIN_ARG_INFO(ai_HttpEnv_reset, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, reset)
+{
+	zend_parse_parameters_none();
+	php_http_env_reset();
+}
+
+
 static zend_function_entry php_http_env_methods[] = {
 	PHP_ME(HttpEnv, getRequestHeader,              ai_HttpEnv_getRequestHeader,              ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(HttpEnv, getRequestBody,                ai_HttpEnv_getRequestBody,                ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -792,6 +804,8 @@ static zend_function_entry php_http_env_methods[] = {
 	PHP_ME(HttpEnv, negotiateCharset,              ai_HttpEnv_negotiateCharset,              ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(HttpEnv, negotiate,                     ai_HttpEnv_negotiate,                     ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 
+	PHP_ME(HttpEnv, reset,                         ai_HttpEnv_reset,                         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+
 	EMPTY_FUNCTION_ENTRY
 };