diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | library/http/http.tcl | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2012-01-13 Donal K. Fellows <dkf@users.sf.net> + + * library/http/http.tcl (http::Connect): [Bug 3472316]: Ensure that we + only try to read the socket error exactly once. + 2012-01-12 Donal K. Fellows <dkf@users.sf.net> * doc/tclvars.n: [Bug 3466506]: Document more environment variables. diff --git a/library/http/http.tcl b/library/http/http.tcl index 12820af..a30c576 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -867,12 +867,11 @@ proc http::cleanup {token} { proc http::Connect {token} { variable $token upvar 0 $token state - global errorInfo errorCode if { [eof $state(sock)] || - [string length [fconfigure $state(sock) -error]] + [set err [fconfigure $state(sock) -error]] ne "" } { - Finish $token "connect failed [fconfigure $state(sock) -error]" 1 + Finish $token "connect failed $err" 1 } else { set state(status) connect fileevent $state(sock) writable {} |