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 | 14c7b573fc0d6f98fe016525ca46a0dc752062a1 (patch) | |
| tree | f28a6f1e1dead1cdcebbda48194d4ad899c6c6dd | |
| parent | 25bd6a60dd33cdd71ba5704d8a0ef1cfcfed0050 (diff) | |
| parent | dd2ad07b7f17937585812360682cef3aed8ceb86 (diff) | |
| download | tcl-14c7b573fc0d6f98fe016525ca46a0dc752062a1.zip tcl-14c7b573fc0d6f98fe016525ca46a0dc752062a1.tar.gz tcl-14c7b573fc0d6f98fe016525ca46a0dc752062a1.tar.bz2 | |
* library/http/http.tcl (http::Connect): [Bug 3472316]: Ensure that we
only try to read the socket error exactly once.
| -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-09 Jan Nijtmans <nijtmans@users.sf.net> * generic/tclUtf.c: [Bug 3464428] string is graph \u0120 is wrong 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 {} |