* Updated http package to version 2.4,

        reflecting the new features just added.

10 files changed, 41 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index d57434e..5071748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-06  Don Porter  <dgp@users.sourceforge.net>
+
+	* doc/http.n:
+	* library/http/*.tcl:
+	* tools/tcl.wse.in:
+	* tools/tclmin.wse:
+	* unix/Makefile.in:
+	* win/{Mm}akefile.*:  Updated http package to version 2.4,
+	reflecting the new features just added.
+
 2001-09-06  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* doc/http.n: noted -binary, charset and coding state keys.
diff --git a/doc/http.n b/doc/http.n
index 07f3e46..3bd828a 100644
--- a/doc/http.n
+++ b/doc/http.n
@@ -5,7 +5,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.13 2001/09/07 00:03:08 hobbs Exp $
+'\" RCS: @(#) $Id: http.n,v 1.14 2001/09/07 02:43:12 dgp Exp $
 '\" 
 .so man.macros
 .TH "Http" n 8.3 Tcl "Tcl Built-In Commands"
@@ -14,7 +14,7 @@
 .SH NAME
 Http \- Client-side implementation of the HTTP/1.0 protocol.
 .SH SYNOPSIS
-\fBpackage require http ?2.3.3?\fP
+\fBpackage require http ?2.4?\fP
 .sp
 \fB::http::config \fI?options?\fR
 .sp
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 314afd1..fd0ed5a 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.38 2001/09/07 00:03:08 hobbs Exp $
+# RCS: @(#) $Id: http.tcl,v 1.39 2001/09/07 02:43:12 dgp Exp $
 
 # Rough version history:
 # 1.0	Old http_get interface
@@ -19,10 +19,12 @@
 # 2.3	Added SSL support, and ability to post from a channel
 #	This version also cleans up error cases and eliminates the
 #	"ioerror" status in favor of raising an error
+# 2.4	Added -binary option to http::geturl and charset element
+#	to the state array.
 
 package require Tcl 8.2
-# keep this in sink with pkgIndex.tcl
-package provide http 2.3.3
+# keep this in sync with pkgIndex.tcl
+package provide http 2.4
 
 namespace eval http {
     variable http
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 3c5d514..b7b87a9 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 if {![package vsatisfies [package provide Tcl] 8.2]} {return}
-package ifneeded http 2.3.3 [list tclPkgSetup $dir http 2.3.3 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister}}}]
+package ifneeded http 2.4 [list tclPkgSetup $dir http 2.4 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister}}}]
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 256ec89..56caaeb 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -1443,12 +1443,12 @@ item: Install File
 end
 item: Install File
   Source=${__TCLBASEDIR__}\library\http\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.3\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl
   Flags=0000000000000010
 end
 item: Install File
   Source=${__TCLBASEDIR__}\library\http\http.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.3\http.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl
   Flags=0000000000000010
 end
 item: Install File
diff --git a/tools/tclmin.wse b/tools/tclmin.wse
index aa3e071..2fd8185 100644
--- a/tools/tclmin.wse
+++ b/tools/tclmin.wse
@@ -36,13 +36,13 @@ item: Install File
   Flags=0000000000000010
 end
 item: Install File
-  Source=n:\dist\tcl8.0\library\http2.1\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.1\pkgIndex.tcl
+  Source=n:\dist\tcl8.0\library\http\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl
   Flags=0000000000000010
 end
 item: Install File
-  Source=n:\dist\tcl8.0\library\http2.1\http.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.1\http.tcl
+  Source=n:\dist\tcl8.0\library\http\http.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl
   Flags=0000000000000010
 end
 item: Install File
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a34f820..ae9bee8 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.81 2001/08/10 01:18:43 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.82 2001/09/07 02:43:12 dgp Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -569,7 +569,7 @@ install-libraries: libraries
 		else true; \
 		fi; \
 	    done;
-	@for i in http2.3 http1.0 opt0.4 encoding msgcat1.2 tcltest2.0; \
+	@for i in http2.4 http1.0 opt0.4 encoding msgcat1.2 tcltest2.0; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -597,10 +597,10 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http1.0; \
 	    done;
-	@echo "Installing library http2.3 directory";
+	@echo "Installing library http2.4 directory";
 	@for j in $(TOP_DIR)/library/http/*.tcl ; \
 	    do \
-	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http2.3; \
+	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http2.4; \
 	    done;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(TOP_DIR)/library/opt/*.tcl ; \
diff --git a/win/Makefile.in b/win/Makefile.in
index a1a5ecd..388e1f8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.51 2001/08/22 23:55:00 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.52 2001/09/07 02:43:12 dgp Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -474,7 +474,7 @@ install-libraries: libraries
 		else true; \
 		fi; \
 	    done;
-	@for i in http1.0 http2.3 opt0.4 encoding msgcat1.2 tcltest2.0; \
+	@for i in http1.0 http2.4 opt0.4 encoding msgcat1.2 tcltest2.0; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -498,10 +498,10 @@ install-libraries: libraries
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing library http2.3 directory";
+	@echo "Installing library http2.4 directory";
 	@for j in $(ROOT_DIR)/library/http/*.tcl; \
 	    do \
-	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http2.3"; \
+	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http2.4"; \
 	    done;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
diff --git a/win/makefile.bc b/win/makefile.bc
index 120e648..2fe7e78 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -390,10 +390,10 @@ install-libraries:
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@echo installing http2.3
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.3"
-	-@copy "$(ROOT)\library\http2.3\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.3"
-	-@copy "$(ROOT)\library\http2.3\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3"
+	@echo installing http2.4
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.4"
+	-@copy "$(ROOT)\library\http2.4\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.4"
+	-@copy "$(ROOT)\library\http2.4\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.4"
 	@echo installing opt0.4
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
 	-@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
diff --git a/win/makefile.vc b/win/makefile.vc
index 80f64a8..ff4bfea 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-2000 Ajuba Solutions.
 #
-# RCS: @(#) $Id: makefile.vc,v 1.63 2001/09/03 00:49:34 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.64 2001/09/07 02:43:12 dgp Exp $
 
 # Does not depend on the presence of any environment variables in
 # order to compile tcl; all needed information is derived from 
@@ -389,10 +389,10 @@ install-libraries:
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@echo installing http2.3
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.3"
-	-@copy "$(ROOT)\library\http\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.3"
-	-@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3"
+	@echo installing http2.4
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.4"
+	-@copy "$(ROOT)\library\http\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.4"
+	-@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.4"
 	@echo installing opt0.4
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
 	-@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"