summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwelch <welch>1999-07-07 01:58:19 (GMT)
committerwelch <welch>1999-07-07 01:58:19 (GMT)
commit7c8e505f416a5b839dfac24a61515fe6e021ae44 (patch)
tree8172bdd1038cf065fe798ac490494c6a216d063c
parent89802c634a74a9dbba1b8ba2c30cb16069744e34 (diff)
downloadtcl-7c8e505f416a5b839dfac24a61515fe6e021ae44.zip
tcl-7c8e505f416a5b839dfac24a61515fe6e021ae44.tar.gz
tcl-7c8e505f416a5b839dfac24a61515fe6e021ae44.tar.bz2
Fixed handling of connection timeouts.
-rw-r--r--library/http/http.tcl5
-rw-r--r--library/http2.0/http.tcl5
-rw-r--r--library/http2.1/http.tcl5
-rw-r--r--library/http2.3/http.tcl5
4 files changed, 16 insertions, 4 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl
index dc3c890..84069ad 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: http.tcl,v 1.6 1999/06/30 17:43:51 welch Exp $
+# RCS: @(#) $Id: http.tcl,v 1.7 1999/07/07 01:58:19 welch Exp $
package provide http 2.1 ;# This uses Tcl namespaces
@@ -238,6 +238,9 @@ proc http::geturl { url args } {
#fileevent $s writable [list set $token\(status) connect]
fileevent $s writable [list http::Connect $token]
http::wait $token
+ if {[string compare $state(status) "timeout"] == 0} {
+ return
+ }
fileevent $s writable {}
unset state(status)
}
diff --git a/library/http2.0/http.tcl b/library/http2.0/http.tcl
index dc3c890..84069ad 100644
--- a/library/http2.0/http.tcl
+++ b/library/http2.0/http.tcl
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: http.tcl,v 1.6 1999/06/30 17:43:51 welch Exp $
+# RCS: @(#) $Id: http.tcl,v 1.7 1999/07/07 01:58:19 welch Exp $
package provide http 2.1 ;# This uses Tcl namespaces
@@ -238,6 +238,9 @@ proc http::geturl { url args } {
#fileevent $s writable [list set $token\(status) connect]
fileevent $s writable [list http::Connect $token]
http::wait $token
+ if {[string compare $state(status) "timeout"] == 0} {
+ return
+ }
fileevent $s writable {}
unset state(status)
}
diff --git a/library/http2.1/http.tcl b/library/http2.1/http.tcl
index dc3c890..84069ad 100644
--- a/library/http2.1/http.tcl
+++ b/library/http2.1/http.tcl
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: http.tcl,v 1.6 1999/06/30 17:43:51 welch Exp $
+# RCS: @(#) $Id: http.tcl,v 1.7 1999/07/07 01:58:19 welch Exp $
package provide http 2.1 ;# This uses Tcl namespaces
@@ -238,6 +238,9 @@ proc http::geturl { url args } {
#fileevent $s writable [list set $token\(status) connect]
fileevent $s writable [list http::Connect $token]
http::wait $token
+ if {[string compare $state(status) "timeout"] == 0} {
+ return
+ }
fileevent $s writable {}
unset state(status)
}
diff --git a/library/http2.3/http.tcl b/library/http2.3/http.tcl
index dc3c890..84069ad 100644
--- a/library/http2.3/http.tcl
+++ b/library/http2.3/http.tcl
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: http.tcl,v 1.6 1999/06/30 17:43:51 welch Exp $
+# RCS: @(#) $Id: http.tcl,v 1.7 1999/07/07 01:58:19 welch Exp $
package provide http 2.1 ;# This uses Tcl namespaces
@@ -238,6 +238,9 @@ proc http::geturl { url args } {
#fileevent $s writable [list set $token\(status) connect]
fileevent $s writable [list http::Connect $token]
http::wait $token
+ if {[string compare $state(status) "timeout"] == 0} {
+ return
+ }
fileevent $s writable {}
unset state(status)
}