X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_header.c;h=19cb936a7a3efb8a2fae5de5cd845e0a475ebd24;hp=6d47d99f2a78d399ca5d5fc24268aac6f97fcb66;hb=468e8d748d365811af4ce890fd8fc4c1f88cc08a;hpb=7cf7de66661e7e40a63c960f5df17fdeb362cb73

diff --git a/php_http_header.c b/php_http_header.c
index 6d47d99..19cb936 100644
--- a/php_http_header.c
+++ b/php_http_header.c
@@ -33,12 +33,7 @@ ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTa
 	php_http_header_parser_dtor(&ctx);
 	php_http_buffer_dtor(&buf);
 
-	if (rs == PHP_HTTP_HEADER_PARSER_STATE_FAILURE) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse headers");
-		return FAILURE;
-	}
-	
-	return SUCCESS;
+	return rs == PHP_HTTP_HEADER_PARSER_STATE_FAILURE ? FAILURE : SUCCESS;
 }
 
 void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg TSRMLS_DC)
@@ -149,13 +144,14 @@ PHP_METHOD(HttpHeader, serialize)
 	if (SUCCESS == zend_parse_parameters_none()) {
 		php_http_buffer_t buf;
 		zend_string *zs;
+		zval name_tmp, value_tmp;
 
 		php_http_buffer_init(&buf);
-		zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0));
+		zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0, &name_tmp));
 		php_http_buffer_appendz(&buf, zs);
 		zend_string_release(zs);
 
-		zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0));
+		zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp));
 		if (zs->len) {
 			php_http_buffer_appends(&buf, ": ");
 			php_http_buffer_appendz(&buf, zs);
@@ -217,12 +213,13 @@ PHP_METHOD(HttpHeader, match)
 	size_t val_len;
 	zend_long flags = PHP_HTTP_MATCH_LOOSE;
 	zend_string *zs;
+	zval value_tmp;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &val_str, &val_len, &flags)) {
 		return;
 	}
 
-	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0));
+	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp));
 	RETVAL_BOOL(php_http_match(zs->val, val_str, flags));
 	zend_string_release(zs);
 }
@@ -234,7 +231,7 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, negotiate)
 {
 	HashTable *supported, *rs;
-	zval *rs_array = NULL;
+	zval name_tmp, value_tmp, *rs_array = NULL;
 	zend_string *zs;
 	char *sep_str = NULL;
 	size_t sep_len = 0;
@@ -248,7 +245,7 @@ PHP_METHOD(HttpHeader, negotiate)
 		array_init(rs_array);
 	}
 
-	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0));
+	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0, &name_tmp));
 	if (zend_string_equals_literal(zs, "Accept")) {
 		sep_str = "/";
 		sep_len = 1;
@@ -258,7 +255,7 @@ PHP_METHOD(HttpHeader, negotiate)
 	}
 	zend_string_release(zs);
 
-	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0));
+	zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp));
 	if ((rs = php_http_negotiate(zs->val, zs->len, supported, sep_str, sep_len))) {
 		PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
 	} else {
@@ -275,14 +272,14 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_getParams, 0, 0, 0)
 ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, getParams)
 {
-	zval zctor, zparams_obj, *zargs = NULL;
+	zval value_tmp, zctor, zparams_obj, *zargs = NULL;
 	
 	ZVAL_STRINGL(&zctor, "__construct", lenof("__construct"));
 	
 	object_init_ex(&zparams_obj, php_http_params_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));
+	ZVAL_COPY_VALUE(&zargs[0], zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp));
 	if (ZEND_NUM_ARGS()) {
 		zend_get_parameters_array(ZEND_NUM_ARGS(), ZEND_NUM_ARGS(), &zargs[1]);
 	}
@@ -291,6 +288,7 @@ PHP_METHOD(HttpHeader, getParams)
 		RETVAL_ZVAL(&zparams_obj, 0, 1);
 	}
 	
+	zval_ptr_dtor(&zctor);
 	if (zargs) {
 		efree(zargs);
 	}