summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-05-09 12:12:26 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-05-09 12:12:26 (GMT)
commitdb87fb7c42f4f45e4ad053f9c3d73d5ace2d44ed (patch)
treeec38884bac68938e6152c2d5eaae9bc51f0ca25d /library
parentc9d16daf31e8306b115e3415f1ef5c6f9097ee2f (diff)
parent4ba2d9a81ad7f1d8b015c4f3f1dd0e6f603ecc3b (diff)
downloadtcl-db87fb7c42f4f45e4ad053f9c3d73d5ace2d44ed.zip
tcl-db87fb7c42f4f45e4ad053f9c3d73d5ace2d44ed.tar.gz
tcl-db87fb7c42f4f45e4ad053f9c3d73d5ace2d44ed.tar.bz2
Merge 8.6; update changes.
Diffstat (limited to 'library')
-rw-r--r--library/http/http.tcl9
-rw-r--r--library/http/pkgIndex.tcl2
2 files changed, 6 insertions, 5 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 03751a3..d950441 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
package require Tcl 8.6-
# Keep this in sync with pkgIndex.tcl and with the install directories in
# Makefiles
-package provide http 2.8.10
+package provide http 2.8.11
namespace eval http {
# Allow resourcing to not clobber existing data
@@ -206,9 +206,10 @@ proc http::Finish {token {errormsg ""} {skipCB 0}} {
set state(error) [list $errormsg $errorInfo $errorCode]
set state(status) "error"
}
- if {
- ($state(status) eq "timeout") || ($state(status) eq "error") ||
- ([info exists state(connection)] && ($state(connection) eq "close"))
+ if { ($state(status) eq "timeout")
+ || ($state(status) eq "error")
+ || ([info exists state(-keepalive)] && !$state(-keepalive))
+ || ([info exists state(connection)] && ($state(connection) eq "close"))
} {
CloseSocket $state(sock) $token
}
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 841b4eb..a0d28f1 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,2 +1,2 @@
if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
-package ifneeded http 2.8.10 [list tclPkgSetup $dir http 2.8.10 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.8.11 [list tclPkgSetup $dir http 2.8.11 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]