* library/http/http.tcl (http::Connect): [Bug 3472316]: Ensure that we

	only try to read the socket error exactly once.

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ffc3cfb..eac6e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 {}