diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-01-26 19:59:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-01-26 19:59:21 (GMT) |
| commit | c38d07a84806fed9a98b05707cec411170a3255d (patch) | |
| tree | ef0100fc1bd40b34ddc37e71b39b4c0fcf02b1e7 /library | |
| parent | 8231fb69951a8e8b62cdd6d709a4d5dab17a34a0 (diff) | |
| parent | 889858de26753cb512fda204a65783c308b7b576 (diff) | |
| download | tcl-rfe_3464401.zip tcl-rfe_3464401.tar.gz tcl-rfe_3464401.tar.bz2 | |
merge to feature branchrfe_3464401
Diffstat (limited to 'library')
| -rw-r--r-- | library/http/http.tcl | 8 | ||||
| -rw-r--r-- | library/http/pkgIndex.tcl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index e8a7c1e..bc8ae7f 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -22,7 +22,7 @@ package require Tcl 8.4 # Keep this in sync with pkgIndex.tcl and with the install directories # in Makefiles -package provide http 2.5.5 +package provide http 2.5.6 namespace eval http { variable http @@ -707,10 +707,10 @@ proc http::cleanup {token} { proc http::Connect {token} { variable $token upvar 0 $token state - global errorInfo errorCode + set err "due to unexpected EOF" if {[eof $state(sock)] || - [string length [fconfigure $state(sock) -error]]} { - Finish $token "connect failed [fconfigure $state(sock) -error]" 1 + [string length [set err [fconfigure $state(sock) -error]]]} { + Finish $token "connect failed $err" 1 } else { set state(status) connect fileevent $state(sock) writable {} diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index cf6a1ff..6c574ef 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -9,4 +9,4 @@ # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.4]} {return} -package ifneeded http 2.5.5 [list tclPkgSetup $dir http 2.5.5 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.5.6 [list tclPkgSetup $dir http 2.5.6 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] |