From 43e27f10a51ad6b206f06c50ea0cd4653bba694a Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Tue, 29 Sep 2020 08:15:32 +0000
Subject: Ticket [0063cbcada]: check http::geturl -headers parameter to be a
 dict.

---
 library/http/http.tcl | 6 ++++--
 tests/http.test       | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index cce1828..abef596 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -733,6 +733,7 @@ proc http::geturl {url args} {
 	-strict		boolean
 	-timeout	integer
 	-validate	boolean
+	-headers	list
     }
     set state(charset)	$defaultCharset
     set options {
@@ -747,8 +748,9 @@ proc http::geturl {url args} {
 	if {[regexp -- $pat $flag]} {
 	    # Validate numbers
 	    if {
-		[info exists type($flag)] &&
-		![string is $type($flag) -strict $value]
+		([info exists type($flag)] &&
+		![string is $type($flag) -strict $value]) ||
+		$flag eq "-headers" && [llength $value] %2 != 0
 	    } {
 		unset $token
 		return -code error \
diff --git a/tests/http.test b/tests/http.test
index 636a651..bd776c6 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -448,6 +448,12 @@ test http-3.33 {http::geturl application/xml is text} -body {
 } -cleanup {
     catch { http::cleanup $token }
 } -result {test 4660 /test}
+test http-3.34 {http::geturl -headers not a dict} -returnCodes error -body {
+    http::geturl http://test/t -headers NoDict
+} -result {Bad value for -headers (NoDict), must be list}
+test http-3.2 {http::geturl} -returnCodes error -body {
+    http::geturl http:junk
+} -result {Unsupported URL: http:junk}
 
 test http-4.1 {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
-- 
cgit v0.12


From 2b01204e41b60fe88eae701bd56dc28b0f33926e Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Tue, 29 Sep 2020 16:12:12 +0000
Subject: Remove wrong copy of test case http-3.2

---
 tests/http.test | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index bd776c6..15bc37f 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -451,9 +451,6 @@ test http-3.33 {http::geturl application/xml is text} -body {
 test http-3.34 {http::geturl -headers not a dict} -returnCodes error -body {
     http::geturl http://test/t -headers NoDict
 } -result {Bad value for -headers (NoDict), must be list}
-test http-3.2 {http::geturl} -returnCodes error -body {
-    http::geturl http:junk
-} -result {Unsupported URL: http:junk}
 
 test http-4.1 {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
-- 
cgit v0.12