From: Michael Wallner <mike@php.net>
Date: Fri, 21 Oct 2005 16:17:44 +0000 (+0000)
Subject: oh dammit
X-Git-Tag: RELEASE_0_17_0~23
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=13d7acf7fe8b82162815e2047c9aedc9a149a3ae;p=m6w6%2Fext-http

oh dammit
---

diff --git a/http_request_object.c b/http_request_object.c
index 459536a..c3efaa9 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -303,28 +303,18 @@ static zend_object_handlers http_request_object_handlers;
 PHP_MINIT_FUNCTION(http_request_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
-	http_request_object_handlers.clone_obj = NULL; /* http_request_object_clone_obj; */
+	http_request_object_handlers.clone_obj = NULL;
 	return SUCCESS;
 }
 
 zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
-{
-	return http_request_object_new_ex(ce, NULL);
-}
-
-zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL* ch TSRMLS_DC)
 {
 	zend_object_value ov;
 	http_request_object *o;
 
 	o = ecalloc(1, sizeof(http_request_object));
 	o->zo.ce = ce;
-	
-	if (ch) {
-		o->ch = ch;
-	} else {
-		o->ch = curl_easy_init();
-	}
+	o->ch = curl_easy_init();
 
 	phpstr_init(&o->history);
 	phpstr_init(&o->request);
@@ -340,39 +330,6 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL* ch TSR
 	return ov;
 }
 
-zend_object_value _http_request_object_clone(zval *object TSRMLS_DC)
-{
-	return http_request_object_clone_obj(object TSRMLS_CC);
-}
-
-static inline zend_object_value _http_request_object_clone_obj(zval *object TSRMLS_DC)
-{
-	zval clone;
-	getObjectEx(http_request_object, obj, object);
-	
-	INIT_PZVAL(&clone);
-	clone.value.obj = http_request_object_new_ex(Z_OBJCE_P(object), curl_easy_duphandle(obj->ch));
-	{
-		getObjectEx(http_request_object, cobj, &clone);
-		
-		/* copy history */
-		phpstr_append(&cobj->history, PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history));
-		/*
-		phpstr_append(&cobj->request, PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request));
-		phpstr_append(&obj->response, PHPSTR_VAL(&obj->response), PHPSTR_ÖEN(&obj->response));
-		*/
-		/* copy properties */
-		zend_hash_copy(OBJ_PROP(cobj), OBJ_PROP(obj), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-		
-		/* attach to pool */
-		if (obj->pool) {
-			http_request_pool_attach(obj->pool, &clone);
-		}
-	}
-	
-	return clone.value.obj;
-}
-
 static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 {
 	zend_class_entry *ce = http_request_object_ce;
@@ -772,7 +729,7 @@ PHP_METHOD(HttpRequest, setOptions)
 	zval *opts = NULL, *old_opts, **opt;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &opts)) {
 		RETURN_FALSE;
 	}
 	
@@ -789,7 +746,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			if (!strcmp(key, "headers")) {
 				zval **headers;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*headers);
 					array_merge(*opt, *headers);
 					continue;
@@ -797,7 +754,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			} else if (!strcmp(key, "cookies")) {
 				zval **cookies;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*cookies);
 					array_merge(*opt, *cookies);
 					continue;
@@ -805,7 +762,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			} else if (!strcmp(key, "ssl")) {
 				zval **ssl;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*ssl);
 					array_merge(*opt, *ssl);
 					continue;
diff --git a/php_http_request_object.h b/php_http_request_object.h
index 7cbc2a3..0e98170 100644
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -46,9 +46,6 @@ extern PHP_MINIT_FUNCTION(http_request_object);
 
 #define http_request_object_new _http_request_object_new
 extern zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC);
-#define http_request_object_new_ex(ce, ch) _http_request_object_new_ex((ce), (ch) TSRMLS_CC)
-#define http_request_object_from_curl(ch) _http_request_object_new_ex(http_request_object_ce, (ch) TSRMLS_CC)
-extern zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch TSRMLS_DC);
 #define http_request_object_free _http_request_object_free
 extern void _http_request_object_free(zend_object *object TSRMLS_DC);
 #define http_request_object_clone(o) _http_request_object_clone((o) TSRMLS_CC)