From 4810938c1699131901dd15caf40842fc0c10b992 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 11 Nov 2009 16:14:42 +0000 Subject: * library/http/http.tcl: Update the URL syntax check to RFC 3986 compliance on the subject of non-encoded question mark characters. [Bug 2891171]. * library/http/pkgIndex.tcl: Bump to http 2.7.5 to avoid any * unix/Makefile.in: confusion with snapshot "releases" * win/Makefile.in: that might be in ActiveTcl, etc. --- ChangeLog | 18 ++++++++++++++---- library/http/http.tcl | 6 +++--- library/http/pkgIndex.tcl | 2 +- unix/Makefile.in | 6 +++--- win/Makefile.in | 6 +++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2fbedd..04ba8b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,19 @@ +2009-11-11 Don Porter + + * library/http/http.tcl: Update the URL syntax check to + RFC 3986 compliance on the subject of non-encoded question mark + characters. [Bug 2891171]. + + * library/http/pkgIndex.tcl: Bump to http 2.7.5 to avoid any + * unix/Makefile.in: confusion with snapshot "releases" + * win/Makefile.in: that might be in ActiveTcl, etc. + 2009-11-11 Alexandre Ferrieux - * generic/tclIO.c: Backported fix for [Bug 2888099] (close - discards ENOSPC error) by saving the errno from the first of - two FlushChannel()s. Uneasy to test; might need specific - channel drivers. Four-hands with aku. + * generic/tclIO.c: Backported fix for [Bug 2888099] (close discards + ENOSPC error) by saving the errno from the first of two + FlushChannel()s. Uneasy to test; might need specific channel drivers. + Four-hands with aku. 2009-11-10 Don Porter diff --git a/library/http/http.tcl b/library/http/http.tcl index e615f58..b2346fa 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -8,12 +8,12 @@ # 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.67.2.8 2009/09/11 15:08:20 dgp Exp $ +# RCS: @(#) $Id: http.tcl,v 1.67.2.9 2009/11/11 16:14:43 dgp Exp $ package require Tcl 8.4 # Keep this in sync with pkgIndex.tcl and with the install directories in # Makefiles -package provide http 2.7.4 +package provide http 2.7.5 namespace eval http { # Allow resourcing to not clobber existing data @@ -433,7 +433,7 @@ proc http::geturl {url args} { ( [^/:\#?]+ ) # (?: : (\d+) )? # )? - ( / [^\#?]* (?: \? [^\#?]* )?)? # (including query) + ( / [^\#]*)? # (including query) (?: \# (.*) )? # $ } diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index 27eb168..1eec2b6 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -1,4 +1,4 @@ # Tcl package index file, version 1.1 if {![package vsatisfies [package provide Tcl] 8.4]} {return} -package ifneeded http 2.7.4 [list tclPkgSetup $dir http 2.7.4 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.7.5 [list tclPkgSetup $dir http 2.7.5 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] diff --git a/unix/Makefile.in b/unix/Makefile.in index 82de682..63b006a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.229.2.18 2009/09/11 15:08:20 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.229.2.19 2009/11/11 16:14:43 dgp Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -786,8 +786,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.4.tm; + @echo "Installing package http 2.7.5 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.5.tm; @echo "Installing library opt0.4 directory"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ diff --git a/win/Makefile.in b/win/Makefile.in index 8e0bc21..acc55cc 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.124.2.12 2009/09/11 15:08:20 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.124.2.13 2009/11/11 16:14:44 dgp Exp $ VERSION = @TCL_VERSION@ @@ -635,8 +635,8 @@ install-libraries: libraries install-tzdata install-msgs do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \ done; - @echo "Installing package http 2.7.4 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.4.tm; + @echo "Installing package http 2.7.5 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.7.5.tm; @echo "Installing library opt0.4 directory"; @for j in $(ROOT_DIR)/library/opt/*.tcl; \ do \ -- cgit v0.12