diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-01-13 11:48:48 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-01-13 11:48:48 (GMT) |
commit | b662395ed59f105a932668feaada9932d46e2fe5 (patch) | |
tree | f28a6f1e1dead1cdcebbda48194d4ad899c6c6dd /library/http | |
parent | 412344346e6346c1ddbf305f10a79b8af8447189 (diff) | |
parent | 2092cc6ad8af82b0cc6c9ba53a0f20994bf04ae2 (diff) | |
download | tcl-b662395ed59f105a932668feaada9932d46e2fe5.zip tcl-b662395ed59f105a932668feaada9932d46e2fe5.tar.gz tcl-b662395ed59f105a932668feaada9932d46e2fe5.tar.bz2 |
* library/http/http.tcl (http::Connect): [Bug 3472316]: Ensure that we
only try to read the socket error exactly once.
Diffstat (limited to 'library/http')
-rw-r--r-- | library/http/http.tcl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index 9c2d43d..1a82c2e 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -863,12 +863,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 "" } then { - Finish $token "connect failed [fconfigure $state(sock) -error]" 1 + Finish $token "connect failed $err" 1 } else { set state(status) connect fileevent $state(sock) writable {} |