X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_header.c;h=8242a7c526ed9cb52212e67aee6b7eaf59ca3b1b;hp=d4f2b510b311e69f3f2bde61fd6825f97ed81748;hb=dafef387fb84301172f0a9628f23819c6f67e47b;hpb=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba

diff --git a/src/php_http_header.c b/src/php_http_header.c
index d4f2b51..8242a7c 100644
--- a/src/php_http_header.c
+++ b/src/php_http_header.c
@@ -116,6 +116,12 @@ zend_string *php_http_header_value_to_string(zval *header)
 	}
 }
 
+static zend_class_entry *php_http_header_class_entry;
+zend_class_entry *php_http_header_get_class_entry(void)
+{
+	return php_http_header_class_entry;
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, name)
 	ZEND_ARG_INFO(0, value)
@@ -209,8 +215,8 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_match, 0, 0, 1)
 ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, match)
 {
-	char *val_str;
-	size_t val_len;
+	char *val_str = NULL;
+	size_t val_len = 0;
 	zend_long flags = PHP_HTTP_MATCH_LOOSE;
 	zend_string *zs;
 	zval value_tmp;
@@ -276,7 +282,7 @@ PHP_METHOD(HttpHeader, getParams)
 	
 	ZVAL_STRINGL(&zctor, "__construct", lenof("__construct"));
 	
-	object_init_ex(&zparams_obj, php_http_params_class_entry);
+	object_init_ex(&zparams_obj, php_http_params_get_class_entry());
 	
 	zargs = (zval *) ecalloc(ZEND_NUM_ARGS()+1, sizeof(zval));
 	ZVAL_COPY_VALUE(&zargs[0], zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp));
@@ -356,8 +362,6 @@ static zend_function_entry php_http_header_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-zend_class_entry *php_http_header_class_entry;
-
 PHP_MINIT_FUNCTION(http_header)
 {
 	zend_class_entry ce = {0};