* unix/Makefile.in (install-libraries): Bump http to 2.7

	* win/Makefile.in (install-libraries):  Added -myaddr option to allow
	* library/http/http.tcl (http::geturl): control of selected socket
	* 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]
	Added ability to override Host in -headers. [Bug 928154]
	Added -strict option to control URL validation on per-call basis.
	[Bug 1560506]

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/http.test b/tests/http.test
index 235252e..18cf75a 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.47 2008/03/12 05:57:44 hobbs Exp $
+# RCS: @(#) $Id: http.test,v 1.48 2008/03/12 09:51:39 hobbs Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -117,7 +117,7 @@ test http-2.1 {http::reset} {
 
 test http-3.1 {http::geturl} {
     list [catch {http::geturl -bogus flag} msg] $msg
-} {1 {Unknown option flag, can be: -binary, -blocksize, -channel, -command, -handler, -headers, -method, -progress, -query, -queryblocksize, -querychannel, -queryprogress, -validate, -timeout, -type}}
+} {1 {Unknown option flag, can be: -binary, -blocksize, -channel, -command, -handler, -headers, -keepalive, -method, -myaddr, -progress, -protocol, -query, -queryblocksize, -querychannel, -queryprogress, -strict, -timeout, -type, -validate}}
 test http-3.2 {http::geturl} {
     catch {http::geturl http:junk} err
     set err
@@ -205,7 +205,7 @@ test http-3.10 {http::geturl queryprogress} {
 	lappend postProgress $y
     }
     set postProgress {}
-    set t [http::geturl $posturl -query $query \
+    set t [http::geturl $posturl -keepalive 0 -query $query \
 	    -queryprogress postProgress -queryblocksize 16384]
     http::wait $t
     list [http::status $t] [string length $query] $postProgress [http::data $t]
@@ -332,7 +332,7 @@ test http-3.24 {http::geturl parse failures} -body {
 } -returnCodes error -result {Illegal encoding character usage "%qu" in URL path}
 
 test http-4.1 {http::Event} {
-    set token [http::geturl $url]
+    set token [http::geturl $url -keepalive 0]
     upvar #0 $token data
     array set meta $data(meta)
     expr ($data(totalsize) == $meta(Content-Length))
@@ -398,7 +398,7 @@ if 0 {
     } {111 111}
 }
 test http-4.7 {http::Event} {
-    set token [http::geturl $url -progress myProgress]
+    set token [http::geturl $url -keepalive 0 -progress myProgress]
     set progress
 } {111 111}
 test http-4.8 {http::Event} {
@@ -417,20 +417,20 @@ test http-4.10 {http::Event} {
 #	Short timeout to working server (the test server). This lets us try a
 #	reset during the connection.
 test http-4.11 {http::Event} {
-    set token [http::geturl $url -timeout 1 -command {#}]
+    set token [http::geturl $url -timeout 1 -keepalive 0 -command {#}]
     http::reset $token
     http::status $token
 } {reset}
 #	Longer timeout with reset.
 test http-4.12 {http::Event} {
-    set token [http::geturl $url/?timeout=10 -command {#}]
+    set token [http::geturl $url/?timeout=10 -keepalive 0 -command {#}]
     http::reset $token
     http::status $token
 } {reset}
 #	Medium timeout to working server that waits even longer. The timeout
 #	hits while waiting for a reply.
 test http-4.13 {http::Event} {
-    set token [http::geturl $url?timeout=30 -timeout 10 -command {#}]
+    set token [http::geturl $url?timeout=30 -keepalive 0 -timeout 10 -command {#}]
     http::wait $token
     http::status $token
 } {timeout}