summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2008-03-12 10:01:01 (GMT)
committerhobbs <hobbs>2008-03-12 10:01:01 (GMT)
commite30c6b2c79b5d0287da601face8b8a84d00f893e (patch)
tree66f63f88c67882186a76efe244620be661569c5d
parentabb6e593c4fe93a99241275011aaa97b6a259485 (diff)
downloadtcl-e30c6b2c79b5d0287da601face8b8a84d00f893e.zip
tcl-e30c6b2c79b5d0287da601face8b8a84d00f893e.tar.gz
tcl-e30c6b2c79b5d0287da601face8b8a84d00f893e.tar.bz2
change http::geturl -keepalive default to 0 as it has poor true pipeline support
-rw-r--r--ChangeLog2
-rw-r--r--doc/http.n6
-rw-r--r--library/http/http.tcl5
3 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 25b941c..9014cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
* library/http/pkgIndex.tcl: interface. [Bug 559898]
* doc/http.n, tests/http.test: Added -keepalive and
-protocol 1.1 with chunked transfer encoding support. [Bug
- 1063703, 1470377, 219225]
+ 1063703, 1470377, 219225] (default keepalive is 0)
Added ability to override Host in -headers. [Bug 928154]
Added -strict option to control URL validation on per-call basis.
[Bug 1560506]
diff --git a/doc/http.n b/doc/http.n
index 8c4434e..d0b3c52 100644
--- a/doc/http.n
+++ b/doc/http.n
@@ -6,7 +6,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.n,v 1.35 2008/03/12 09:51:39 hobbs Exp $
+'\" RCS: @(#) $Id: http.n,v 1.36 2008/03/12 10:01:02 hobbs Exp $
'\"
.so man.macros
.TH "http" n 2.7 http "Tcl Bundled Packages"
@@ -207,8 +207,8 @@ Pragma: no-cache
.CE
.TP
\fB\-keepalive\fR \fIboolean\fR
-If true (the default), attempt to keep the connection open for servicing
-multiple requests.
+If true, attempt to keep the connection open for servicing
+multiple requests. Default is 0.
.TP
\fB\-method\fR \fItype\fR
Force the HTTP request method to \fItype\fR. \fB::http::geturl\fR will
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 98b1a64..84a1da2 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -8,7 +8,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.66 2008/03/12 09:51:38 hobbs Exp $
+# RCS: @(#) $Id: http.tcl,v 1.67 2008/03/12 10:01:02 hobbs Exp $
package require Tcl 8.4
# Keep this in sync with pkgIndex.tcl and with the install directories
@@ -79,7 +79,7 @@ namespace eval http {
# Let user control default keepalive for compatibility
variable defaultKeepalive
if {![info exists defaultKeepalive]} {
- set defaultKeepalive 1
+ set defaultKeepalive 0
}
namespace export geturl config reset wait formatQuery register unregister
@@ -570,6 +570,7 @@ proc http::geturl { url args } {
# command callback (if available) because we're going to throw an
# exception from here instead.
+ set state(sock) $sock
Finish $token "" 1
cleanup $token
return -code error $sock