diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-11-20 15:58:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-11-20 15:58:51 (GMT) |
| commit | 8afc3921290bdc520b52a80ef234c37766412ead (patch) | |
| tree | 8918f0994c9bf37c25446b1dbc1b20ff89ecd837 | |
| parent | bab811ce01503b56512aedf78871afa70fbca473 (diff) | |
| parent | c53c54cec414ce179376da39c8fa89d76c049ed4 (diff) | |
| download | tcl-8afc3921290bdc520b52a80ef234c37766412ead.zip tcl-8afc3921290bdc520b52a80ef234c37766412ead.tar.gz tcl-8afc3921290bdc520b52a80ef234c37766412ead.tar.bz2 | |
Merge 8.6; update changes.
| -rw-r--r-- | changes | 5 | ||||
| -rw-r--r-- | library/http/http.tcl | 4 | ||||
| -rw-r--r-- | library/http/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
5 files changed, 11 insertions, 8 deletions
@@ -8941,4 +8941,7 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich) 2019-11-15 (bug)[135804] segfault in [next] after destroy (coulter,sebres) -- Released 8.6.10, November 21, 2019 - details at http://core.tcl-lang.org/tcl/ - +2019-11-18 (bug)[13657a] application/json us text, not binary (noe,nijtmans) +=> http 2.9.1 + +- Released 8.6.10, Nov 21, 2019 - details at http://core.tcl-lang.org/tcl/ - diff --git a/library/http/http.tcl b/library/http/http.tcl index f82bced..0aa283f 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.9.0 +package provide http 2.9.1 namespace eval http { # Allow resourcing to not clobber existing data @@ -2978,7 +2978,7 @@ proc http::IsBinaryContentType {type} { # and so on. if {$major eq "application"} { set minor [string trimright $minor] - if {$minor in {"xml" "xml-external-parsed-entity" "xml-dtd"}} { + if {$minor in {"json" "xml" "xml-external-parsed-entity" "xml-dtd"}} { return false } } diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index 4f74635..f9f1176 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.9.0 [list tclPkgSetup $dir http 2.9.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.9.1 [list tclPkgSetup $dir http 2.9.1 {{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 af9e090..99bdf05 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -938,8 +938,8 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.9.0 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm; + @echo "Installing package http 2.9.1 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.1.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ diff --git a/win/Makefile.in b/win/Makefile.in index d7b4142..d24575f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -705,8 +705,8 @@ install-libraries: libraries install-tzdata install-msgs do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \ done; - @echo "Installing package http 2.9.0 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.9.0.tm; + @echo "Installing package http 2.9.1 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.9.1.tm; @echo "Installing library opt0.4 directory"; @for j in $(ROOT_DIR)/library/opt/*.tcl; \ do \ |