X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request.c;h=a7086d370eedd683db1dec74085a534e6cecc182;hp=b22e12e3876d66bc3a6d18341b67cdfb4b2dd8ee;hb=4957436be59f65fae9cdbaec1dc865acc680862f;hpb=a4fd0a809ae831f21cbaec14e24c3d3ee0569c12

diff --git a/php_http_request.c b/php_http_request.c
index b22e12e..a7086d3 100644
--- a/php_http_request.c
+++ b/php_http_request.c
@@ -36,7 +36,7 @@ PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, ph
 			php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST, "Could not initialize request");
 			if (free_h) {
 				h->ops->dtor = NULL;
-				php_http_request_free(&h);
+				php_http_request_free(&free_h);
 			}
 		}
 	}
@@ -68,13 +68,33 @@ PHP_HTTP_API void php_http_request_free(php_http_request_t **h)
 
 PHP_HTTP_API php_http_request_t *php_http_request_copy(php_http_request_t *from, php_http_request_t *to)
 {
-	if (from->ops->copy) {
-		return from->ops->copy(from, to);
+	if (!from->ops->copy) {
+		return NULL;
+	} else {
+		TSRMLS_FETCH_FROM_CTX(from->ts);
+
+		if (!to) {
+			to = ecalloc(1, sizeof(*to));
+		}
+
+		to->ops = from->ops;
+		if (from->rf) {
+			php_http_resource_factory_addref(from->rf);
+			to->rf = from->rf;
+		} else {
+			to->rf = php_http_resource_factory_init(NULL, to->ops->rsrc, to, NULL);
+		}
+		to->buffer = php_http_buffer_init(NULL);
+		to->parser = php_http_message_parser_init(NULL TSRMLS_CC);
+		to->message = php_http_message_init(NULL, 0 TSRMLS_CC);
+
+		TSRMLS_SET_CTX(to->ts);
+
+		return to->ops->copy(from, to);
 	}
-	return NULL;
 }
 
-PHP_HTTP_API STATUS php_http_request_exec(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body)
+PHP_HTTP_API STATUS php_http_request_exec(php_http_request_t *h, const char *meth, const char *url, php_http_message_body_t *body)
 {
 	if (h->ops->exec) {
 		return h->ops->exec(h, meth, url, body);
@@ -396,7 +416,7 @@ static inline zend_object_value php_http_request_object_message(zval *this_ptr,
 	}
 }
 
-STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zval *this_ptr, php_http_request_method_t *meth, char **url, php_http_message_body_t **body TSRMLS_DC)
+STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zval *this_ptr, char **meth, char **url, php_http_message_body_t **body TSRMLS_DC)
 {
 	zval *zoptions;
 	php_http_request_progress_t *progress;
@@ -407,11 +427,11 @@ STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zv
 	zend_update_property_null(php_http_request_class_entry, getThis(), ZEND_STRL("info") TSRMLS_CC);
 
 	if (meth) {
-		*meth = (php_http_request_method_t) Z_LVAL_P(zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("method"), 0 TSRMLS_CC));
+		*meth = Z_STRVAL_P(zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("method"), 0 TSRMLS_CC));
 	}
 
 	if (url) {
-		php_url *tmp, qdu = {0};
+		php_url *tmp, qdu = {NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL};
 		zval *zurl = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("url"), 0 TSRMLS_CC);
 		zval *zqdata = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), 0 TSRMLS_CC);
 
@@ -427,6 +447,9 @@ STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zv
 
 		if (Z_TYPE_P(zbody) == IS_OBJECT) {
 			*body = ((php_http_message_body_object_t *)zend_object_store_get_object(zbody TSRMLS_CC))->body;
+			if (*body) {
+				php_stream_rewind(php_http_message_body_stream(*body));
+			}
 		}
 	}
 
@@ -486,7 +509,7 @@ STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, z
 			ZVAL_OBJVAL(new_hist, ov, 0);
 
 			if (Z_TYPE_P(old_hist) == IS_OBJECT) {
-				php_http_message_object_prepend(new_hist, old_hist, 0 TSRMLS_CC);
+				php_http_message_object_prepend(new_hist, old_hist, 1 TSRMLS_CC);
 			}
 
 			zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("history"), new_hist TSRMLS_CC);
@@ -539,9 +562,14 @@ STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, z
 
 static int apply_pretty_key(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
+	zval **zpp = pDest, *arr = va_arg(args, zval *);
+
 	if (hash_key->arKey && hash_key->nKeyLength > 1) {
-		/* FIXME: this seems evil */
-		hash_key->h = zend_hash_func(php_http_pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength);
+		char *tmp = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 0);
+
+		Z_ADDREF_PP(zpp);
+		add_assoc_zval_ex(arr, tmp, hash_key->nKeyLength, *zpp);
+		efree(tmp);
 	}
 	return ZEND_HASH_APPLY_KEEP;
 }
@@ -571,9 +599,15 @@ static inline void php_http_request_object_set_options_subr(INTERNAL_FUNCTION_PA
 			}
 		} else if (opts) {
 			if (prettify_keys) {
-				zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) TSRMLS_CC, apply_pretty_key, 0, NULL);
+				zval *tmp;
+
+				MAKE_STD_ZVAL(tmp);
+				array_init_size(tmp, zend_hash_num_elements(Z_ARRVAL_P(opts)));
+				zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) TSRMLS_CC, apply_pretty_key, 1, tmp);
+				opts = tmp;
+			} else {
+				Z_ADDREF_P(opts);
 			}
-			Z_ADDREF_P(opts);
 			add_assoc_zval_ex(new_opts, key, len, opts);
 		}
 		zend_update_property(php_http_request_class_entry, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
@@ -914,10 +948,11 @@ PHP_METHOD(HttpRequest, getUrl)
 
 PHP_METHOD(HttpRequest, setMethod)
 {
-	long meth;
+	char *meth_str;
+	int meth_len;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
-		zend_update_property_long(php_http_request_class_entry, getThis(), ZEND_STRL("method"), meth TSRMLS_CC);
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &meth_str, &meth_len)) {
+		zend_update_property_stringl(php_http_request_class_entry, getThis(), ZEND_STRL("method"), meth_str, meth_len TSRMLS_CC);
 	}
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -1149,12 +1184,17 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 
 PHP_METHOD(HttpRequest, getResponseBody)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		zval *message = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC);
+	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+		if (SUCCESS == zend_parse_parameters_none()) {
+			zval *message = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC);
 
-		RETURN_OBJVAL(((php_http_message_object_t *)zend_object_store_get_object(message TSRMLS_CC))->body, 1);
-	}
-	RETURN_FALSE;
+			if (Z_TYPE_P(message) == IS_OBJECT) {
+				RETURN_OBJVAL(((php_http_message_object_t *)zend_object_store_get_object(message TSRMLS_CC))->body, 1);
+			} else {
+				php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HttpRequest does not contain a response message");
+			}
+		}
+	} end_error_handling();
 }
 
 PHP_METHOD(HttpRequest, getResponseCode)
@@ -1252,8 +1292,8 @@ PHP_METHOD(HttpRequest, send)
 	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			php_http_request_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-			php_http_request_method_t meth = PHP_HTTP_NO_REQUEST_METHOD;
 			php_http_message_body_t *body = NULL;
+			char *meth = NULL;
 			char *url = NULL;
 
 			if (SUCCESS == php_http_request_object_requesthandler(obj, getThis(), &meth, &url, &body TSRMLS_CC)) {
@@ -1288,7 +1328,7 @@ PHP_MINIT_FUNCTION(http_request)
 	zend_declare_property_long(php_http_request_class_entry, ZEND_STRL("responseCode"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_string(php_http_request_class_entry, ZEND_STRL("responseStatus"), "", ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("requestMessage"), ZEND_ACC_PRIVATE TSRMLS_CC);
-	zend_declare_property_long(php_http_request_class_entry, ZEND_STRL("method"), PHP_HTTP_GET, ZEND_ACC_PRIVATE TSRMLS_CC);
+	zend_declare_property_string(php_http_request_class_entry, ZEND_STRL("method"), "GET", ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_string(php_http_request_class_entry, ZEND_STRL("url"), "", ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_string(php_http_request_class_entry, ZEND_STRL("contentType"), "", ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_string(php_http_request_class_entry, ZEND_STRL("requestBody"), "", ZEND_ACC_PRIVATE TSRMLS_CC);