X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_curl_client.c;h=97b04a229200e6bf70bc0d4a1e96dc93ae77c864;hb=5913db177b07398233cb00d2357aba595eab8371;hp=a2e0d3fc4ceb07eb9524b0a49182e53ddf1a8032;hpb=efdbb46bf78df0d34936c536bd78b05abadd3a0d;p=m6w6%2Fext-http

diff --git a/php_http_curl_client.c b/php_http_curl_client.c
index a2e0d3f..97b04a2 100644
--- a/php_http_curl_client.c
+++ b/php_http_curl_client.c
@@ -175,15 +175,22 @@ static int php_http_curl_client_raw_callback(CURL *ch, curl_infotype type, char
 	switch (type) {
 		case CURLINFO_HEADER_IN:
 		case CURLINFO_DATA_IN:
-		case CURLINFO_HEADER_OUT:
-		case CURLINFO_DATA_OUT:
-			php_http_buffer_append(h->buffer, data, length);
+			php_http_buffer_append(h->response.buffer, data, length);
 
 			if (curl->options.redirects) {
 				flags |= PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS;
 			}
 
-			if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(h->parser, h->buffer, flags, &h->message)) {
+			if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(h->response.parser, h->response.buffer, flags, &h->response.message)) {
+				return -1;
+			}
+			break;
+
+		case CURLINFO_HEADER_OUT:
+		case CURLINFO_DATA_OUT:
+			php_http_buffer_append(h->request.buffer, data, length);
+
+			if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(h->request.parser, h->request.buffer, flags, &h->request.message)) {
 				return -1;
 			}
 			break;
@@ -510,11 +517,13 @@ static STATUS set_options(php_http_client_t *h, HashTable *options)
 				zval **cookie_val;
 
 				FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) {
-					if (cookie_key.type == HASH_KEY_IS_STRING) {
-						zval *val = php_http_ztyp(IS_STRING, *cookie_val);
-						php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
-						zval_ptr_dtor(&val);
-					}
+					zval *val = php_http_ztyp(IS_STRING, *cookie_val);
+
+					php_http_array_hashkey_stringify(&cookie_key);
+					php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
+					php_http_array_hashkey_stringfree(&cookie_key);
+
+					zval_ptr_dtor(&val);
 				}
 
 				php_http_buffer_fix(&curl->options.cookies);
@@ -1024,7 +1033,7 @@ static STATUS php_http_curl_client_reset(php_http_client_t *h)
 	return SUCCESS;
 }
 
-STATUS php_http_curl_client_prepare(php_http_client_t *h, php_http_message_t *msg)
+PHP_HTTP_API STATUS php_http_curl_client_prepare(php_http_client_t *h, php_http_message_t *msg)
 {
 	size_t body_size;
 	php_http_curl_client_t *curl = h->ctx;
@@ -1073,6 +1082,7 @@ STATUS php_http_curl_client_prepare(php_http_client_t *h, php_http_message_t *ms
 	}
 
 	/* request headers */
+	php_http_message_update_headers(msg);
 	if (zend_hash_num_elements(&msg->hdrs)) {
 		php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0);
 		zval **header_val;
@@ -1245,11 +1255,6 @@ static php_http_resource_factory_ops_t php_http_curl_client_resource_factory_ops
 	php_http_curl_dtor
 };
 
-static zend_class_entry *get_class_entry(void)
-{
-	return php_http_curl_client_class_entry;
-}
-
 static php_http_client_ops_t php_http_curl_client_ops = {
 	&php_http_curl_client_resource_factory_ops,
 	php_http_curl_client_init,
@@ -1260,7 +1265,7 @@ static php_http_client_ops_t php_http_curl_client_ops = {
 	php_http_curl_client_setopt,
 	php_http_curl_client_getopt,
 	(php_http_new_t) php_http_curl_client_object_new_ex,
-	get_class_entry
+	php_http_curl_client_get_class_entry
 };
 
 PHP_HTTP_API php_http_client_ops_t *php_http_curl_client_get_ops(void)
@@ -1278,8 +1283,14 @@ PHP_HTTP_BEGIN_ARGS(send, 1)
 	PHP_HTTP_ARG_VAL(request, 0)
 PHP_HTTP_END_ARGS;
 
-zend_class_entry *php_http_curl_client_class_entry;
-zend_function_entry php_http_curl_client_method_entry[] = {
+static zend_class_entry *php_http_curl_client_class_entry;
+
+zend_class_entry *php_http_curl_client_get_class_entry(void)
+{
+	return php_http_curl_client_class_entry;
+}
+
+static zend_function_entry php_http_curl_client_method_entry[] = {
 	PHP_HTTP_CURL_CLIENT_CLIENT_MALIAS(send, ZEND_ACC_PUBLIC)
 	EMPTY_FUNCTION_ENTRY
 };