Merge 8.6

3 files changed, 4 insertions, 4 deletions

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 7236bae..baa3caa 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
@@ -3020,7 +3020,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 3bc111f..e126083 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,4 +1,4 @@
 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}}}]
 package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]]
 package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]]
diff --git a/library/manifest.txt b/library/manifest.txt
index 307302f..16092b8 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -5,7 +5,7 @@ apply {{dir} {
   set ::test [info script]
   set isafe [interp issafe]
   foreach {safe package version file} {
-    0 http            2.9.0 {http http.tcl}
+    0 http            2.9.1 {http http.tcl}
     1 msgcat          1.7.0  {msgcat msgcat.tcl}
     1 opt             0.4.7  {opt optparse.tcl}
     0 platform        1.0.14 {platform platform.tcl}