diff options
| author | kjnash <k.j.nash@usa.net> | 2018-04-21 13:47:09 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2018-04-21 13:47:09 (GMT) |
| commit | 41954059c43ef2b0ed2392f022082b9e71b3cd55 (patch) | |
| tree | 0b2d84d2c998c3454e1d273c8ae19b4858ffef74 /library/http/http.tcl | |
| parent | b169c964e611847319cc92875f653466939bcb43 (diff) | |
| parent | ae76fbd559e8e30a6cb4c448bf4c924cbd79841b (diff) | |
| download | tcl-41954059c43ef2b0ed2392f022082b9e71b3cd55.zip tcl-41954059c43ef2b0ed2392f022082b9e71b3cd55.tar.gz tcl-41954059c43ef2b0ed2392f022082b9e71b3cd55.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library/http/http.tcl')
| -rw-r--r-- | library/http/http.tcl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index 30b69e6..4bde573 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -11,7 +11,7 @@ package require Tcl 8.6- # Keep this in sync with pkgIndex.tcl and with the install directories in # Makefiles -package provide http 2.8.12 +package provide http 2.8.13 namespace eval http { # Allow resourcing to not clobber existing data @@ -1100,7 +1100,7 @@ proc http::geturl {url args} { set pre [clock milliseconds] Log ##Log pre socket opened, - token $token Log ##Log [concat $defcmd $sockopts $targetAddr] - token $token - if {[catch {eval $defcmd $sockopts $targetAddr} sock]} { + if {[catch {eval $defcmd $sockopts $targetAddr} sock errdict]} { # Something went wrong while trying to establish the connection. # Clean up after events and such, but DON'T call the command # callback (if available) because we're going to throw an @@ -1109,7 +1109,8 @@ proc http::geturl {url args} { set state(sock) NONE Finish $token $sock 1 cleanup $token - return -code error $sock + dict unset errdict -level + return -options $errdict $sock } else { # Initialisation of a new socket. Log ##Log post socket opened, - token $token |