[sr-dev] git:master:374edbfe: utils: Additional headers need to be added as chunk, not as a string

[Carsten Bock]

Module: kamailio
Branch: master
Commit: 374edbfe3b05eb74acc871c3d72474c08e8d5e34
URL: https://github.com/kamailio/kamailio/commit/374edbfe3b05eb74acc871c3d72474c08e8d5e34

Author: Carsten Bock <carsten at ng-voice.com>
Committer: Carsten Bock <carsten at ng-voice.com>
Date: 2015-08-04T20:51:23+02:00

utils: Additional headers need to be added as chunk, not as a string

---

Modified: modules/utils/functions.c

---

Diff:  https://github.com/kamailio/kamailio/commit/374edbfe3b05eb74acc871c3d72474c08e8d5e34.diff
Patch: https://github.com/kamailio/kamailio/commit/374edbfe3b05eb74acc871c3d72474c08e8d5e34.patch

---

diff --git a/modules/utils/functions.c b/modules/utils/functions.c
index a5b62dd..2d06403 100644
--- a/modules/utils/functions.c
+++ b/modules/utils/functions.c
@@ -88,6 +88,7 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h
 	pv_spec_t *dst;
 	pv_value_t val;
 	double download_size;
+	struct curl_slist *chunk = NULL;
 
 	memset(&stream, 0, sizeof(http_res_stream_t));
 
@@ -130,14 +131,12 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h
 			memcpy(hdr, hdr_value.s, hdr_value.len);
 			*(hdr + hdr_value.len) = (char)0;
 
-			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hdr);
+			chunk = curl_slist_append(chunk, hdr);
+			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
 		}
 	}
 
 	if (_post) {
-		/* Now specify we want to POST data */ 
-		curl_easy_setopt(curl, CURLOPT_POST, 1L);
-
 		if (fixup_get_svalue(_m, (gparam_p)_post, &post_value) != 0) {
 			LM_ERR("cannot get post value\n");
 			curl_easy_cleanup(curl);
@@ -146,6 +145,9 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h
 			return -1;
 		}
 		if (post_value.len > 0) {
+			/* Now specify we want to POST data */ 
+			curl_easy_setopt(curl, CURLOPT_POST, 1L);
+
 			post = pkg_malloc(post_value.len + 1);
 			if (post == NULL) {
 				curl_easy_cleanup(curl);
@@ -175,6 +177,9 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h
 	if (_hdr) {
 		pkg_free(hdr);
 	}
+	if (chunk) {
+		 curl_slist_free_all(chunk);
+	}
 
 	if (res != CURLE_OK) {
 		/* http://curl.haxx.se/libcurl/c/libcurl-errors.html */