X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=08993bd4be15d09d688ce54f0e02471436b9db37;hb=d97755079e04b0fca303641092603dd1aea0585f;hp=34bc75393732a41b6aff9c86d48b0217da577503;hpb=a41703eafb1f1bb7f2968e97d471499c986a471b;p=m6w6%2Fext-http

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 34bc753..08993bd 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -62,12 +62,14 @@ static void set_option(zval *options, const char *name_str, size_t name_len, int
 }
 static zval *get_option(zval *options, const char *name_str, size_t name_len)
 {
-	zval *val;
+	zval *val = NULL;
 
 	if (Z_TYPE_P(options) == IS_OBJECT) {
 		val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0);
-	} else {
+	} else if (Z_TYPE_P(options) == IS_ARRAY) {
 		val = zend_symtable_str_find(Z_ARRVAL_P(options), name_str, name_len);
+	} else {
+		abort();
 	}
 	if (val) {
 		Z_TRY_ADDREF_P(val);
@@ -85,7 +87,7 @@ static php_http_message_body_t *get_body(zval *options)
 
 			body = body_obj->body;
 		}
-		zval_ptr_dtor(zbody);
+		Z_TRY_DELREF_P(zbody);
 	}
 
 	return body;
@@ -101,40 +103,37 @@ static php_http_message_t *get_request(zval *options)
 
 			request = request_obj->message;
 		}
-		zval_ptr_dtor(zrequest);
+		Z_TRY_DELREF_P(zrequest);
 	}
 
 	return request;
 }
-static void set_cookie(zval *options, zval *zcookie_new TSRMLS_DC)
+static void set_cookie(zval *options, zval *zcookie_new)
 {
-	zval *zcookies_set;
+	zval tmp, *zcookies_set;
 	php_http_arrkey_t key;
 	php_http_cookie_object_t *obj = PHP_HTTP_OBJ(NULL, zcookie_new);
 
+	array_init(&tmp);
 	zcookies_set = get_option(options, ZEND_STRL("cookies"));
-	if (!zcookies_set || Z_TYPE_P(zcookies_set) != IS_ARRAY) {
-		if (zcookies_set) {
-			zval_ptr_dtor(zcookies_set);
-		}
-		array_init_size(zcookies_set, zend_hash_num_elements(&obj->list->cookies));
-	} else {
-		SEPARATE_ZVAL(zcookies_set);
+	if (zcookies_set && Z_TYPE_P(zcookies_set) == IS_ARRAY) {
+		array_copy(Z_ARRVAL_P(zcookies_set), Z_ARRVAL(tmp));
+		zval_ptr_dtor(zcookies_set);
 	}
 
 	ZEND_HASH_FOREACH_KEY(&obj->list->cookies, key.h, key.key)
 	{
 		Z_ADDREF_P(zcookie_new);
 		if (key.key) {
-			add_assoc_zval_ex(zcookies_set, key.key->val, key.key->len, zcookie_new);
+			add_assoc_zval_ex(&tmp, key.key->val, key.key->len, zcookie_new);
 		} else {
-			add_index_zval(zcookies_set, key.h, zcookie_new);
+			add_index_zval(&tmp, key.h, zcookie_new);
 		}
 	}
 	ZEND_HASH_FOREACH_END();
 
-	set_option(options, ZEND_STRL("cookies"), IS_ARRAY, zcookies_set, 0);
-	zval_ptr_dtor(zcookies_set);
+	set_option(options, ZEND_STRL("cookies"), IS_ARRAY, &tmp, 0);
+	zval_ptr_dtor(&tmp);
 }
 
 php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request)
@@ -465,7 +464,6 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t
 				zval *tmp = zoption;
 				SEPARATE_ZVAL(tmp);
 				convert_to_array(tmp);
-				zval_ptr_dtor(zoption);
 				zoption = tmp;
 			}
 
@@ -1278,14 +1276,14 @@ static PHP_METHOD(HttpEnvResponse, setCookie)
 	case IS_ARRAY:
 		list = php_http_cookie_list_from_struct(NULL, zcookie_new);
 		zcookie_new = &tmp;
-		ZVAL_OBJ(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo);
+		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1);
 		break;
 
 	default:
 		zs = zval_get_string(zcookie_new);
 		list = php_http_cookie_list_parse(NULL, zs->val, zs->len, 0, NULL);
 		zcookie_new = &tmp;
-		ZVAL_OBJ(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo);
+		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1);
 	}
 	zend_restore_error_handling(&zeh);