From: Michael Wallner <mike@php.net>
Date: Thu, 6 Nov 2014 12:06:45 +0000 (+0100)
Subject: Fixed bug #68149 (duplicate content-length with libcurl < 7.23)
X-Git-Tag: RELEASE_2_1_4~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=acffb304a34e5e2a09c234f54179c34a0e8d3226;p=m6w6%2Fext-http

Fixed bug #68149 (duplicate content-length with libcurl < 7.23)
---

diff --git a/package.xml b/package.xml
index eddca26..1966888 100644
--- a/package.xml
+++ b/package.xml
@@ -49,6 +49,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  <license>BSD, revised</license>
  <notes><![CDATA[
 * Fixed bug #68353 (QsoSSL support removed in libcurl 7.39)
+* Fixed bug #68149 (duplicate content-length with libcurl < 7.23)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 48deae3..4573df7 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -1636,15 +1636,25 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_
 	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;
+		zval **header_val, *header_cpy;
 		HashPosition pos;
 		php_http_buffer_t header;
+#if !PHP_HTTP_CURL_VERSION(7,23,0)
+		zval **ct = NULL;
+
+		zend_hash_find(&msg->hdrs, ZEND_STRS("Content-Length"), (void *) &ct);
+#endif
 
 		php_http_buffer_init(&header);
 		FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) {
 			if (header_key.type == HASH_KEY_IS_STRING) {
-				zval *header_cpy = php_http_ztyp(IS_STRING, *header_val);
-
+#if !PHP_HTTP_CURL_VERSION(7,23,0)
+				/* avoid duplicate content-length header */
+				if (ct && *ct == *header_val) {
+					continue;
+				}
+#endif
+				header_cpy = php_http_ztyp(IS_STRING, *header_val);
 				php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
 				php_http_buffer_fix(&header);
 				curl->options.headers = curl_slist_append(curl->options.headers, header.data);