diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-09-30 15:59:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-09-30 15:59:51 (GMT) |
| commit | cd8531d2930e5f6b0363494960ec70745709e3a0 (patch) | |
| tree | f5142d6a92daef42c95d53c04f4d2d3bff26335f /library | |
| parent | 4d4d50dc93778fa2443c61b728ae30620ccc73be (diff) | |
| parent | 1f4f47ccf50b4d6518c3dbfd9fd09c7bbb785929 (diff) | |
| download | tcl-cd8531d2930e5f6b0363494960ec70745709e3a0.zip tcl-cd8531d2930e5f6b0363494960ec70745709e3a0.tar.gz tcl-cd8531d2930e5f6b0363494960ec70745709e3a0.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/http/http.tcl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index abef596..b0f87de 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -733,7 +733,7 @@ proc http::geturl {url args} { -strict boolean -timeout integer -validate boolean - -headers list + -headers dict } set state(charset) $defaultCharset set options { @@ -747,10 +747,8 @@ proc http::geturl {url args} { foreach {flag value} $args { if {[regexp -- $pat $flag]} { # Validate numbers - if { - ([info exists type($flag)] && - ![string is $type($flag) -strict $value]) || - $flag eq "-headers" && [llength $value] %2 != 0 + if {($flag eq "-headers") ? [catch {dict size $value}] : + ([info exists type($flag)] && ![string is $type($flag) -strict $value]) } { unset $token return -code error \ |