merge trunk

11 files changed, 62 insertions, 55 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}
diff --git a/macosx/README b/macosx/README
index 4a97fee..49953c2 100644
--- a/macosx/README
+++ b/macosx/README
@@ -57,7 +57,7 @@ No nroff manpages are installed by default by the GNUmakefile.
 
 - The Tcl framework can be installed in any of the system's standard
 framework directories:
-	$HOME/Library/Frameworks /Library/Frameworks /System/Library/Frameworks
+	$HOME/Library/Frameworks /Library/Frameworks
 
 
 3. Building Tcl on Mac OS X
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index a76e8df..43b3703 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -344,9 +344,13 @@ test cmdMZ-5.4 {Tcl_TimeObjCmd: nothing happens with negative iteration counts}
 test cmdMZ-5.5 {Tcl_TimeObjCmd: result format} -body {
     time {format 1}
 } -match regexp -result {^\d+ microseconds per iteration}
-test cmdMZ-5.6 {Tcl_TimeObjCmd: slower commands take longer} {
-    expr {[lindex [time {_nrt_sleep 0.01}] 0] < [lindex [time {_nrt_sleep 10.0}] 0]}
-} 1
+test cmdMZ-5.6 {Tcl_TimeObjCmd: slower commands take longer} -body {
+    set m1 [lindex [time {_nrt_sleep 0.01}] 0]
+    set m2 [lindex [time {_nrt_sleep 10.0}] 0]
+    list \
+	[expr {$m1 < $m2}] \
+	$m1 $m2; # interesting only in error case.
+} -match glob -result [list 1 *]
 test cmdMZ-5.7 {Tcl_TimeObjCmd: errors generate right trace} {
     list [catch {time {error foo}} msg] $msg $::errorInfo
 } {1 foo {foo
@@ -397,11 +401,10 @@ test cmdMZ-6.5a {Tcl_TimeRateObjCmd: result format and one iteration} {
 test cmdMZ-6.5b {Tcl_TimeRateObjCmd: result format without iterations} {
     regexp {^0 \ws/# 0 # 0 #/sec 0 net-ms$} [timerate {} 0 0]
 } 1
-test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measument} {
-    lassign [timerate {_nrt_sleep 0} 50] ovh
-    set m1 [timerate -overhead $ovh {_nrt_sleep 0.01} 50]
-    set m2 [timerate -overhead $ovh {_nrt_sleep 1.00} 50]
-    list \
+test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measument} -body {
+    set m1 [timerate {_nrt_sleep 0.01} 50]
+    set m2 [timerate {_nrt_sleep 1.00} 50]
+    list [list \
 	[expr {[lindex $m1 0] < [lindex $m2 0]}] \
 	[expr {[lindex $m1 0] < 100}] \
 	[expr {[lindex $m2 0] > 100}] \
@@ -410,8 +413,9 @@ test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains
 	[expr {[lindex $m1 4] > 10000}] \
 	[expr {[lindex $m2 4] < 10000}] \
 	[expr {[lindex $m1 6] > 5 && [lindex $m1 6] < 100}] \
-	[expr {[lindex $m2 6] > 5 && [lindex $m2 6] < 100}]
-} [lrepeat 9 1]
+	[expr {[lindex $m2 6] > 5 && [lindex $m2 6] < 100}] \
+    ] $m1 $m2; # interesting only in error case.
+} -match glob -result [list [lrepeat 9 1] *]
 test cmdMZ-6.7 {Tcl_TimeRateObjCmd: errors generate right trace} {
     list [catch {timerate {error foo} 1} msg] $msg $::errorInfo
 } {1 foo {foo
@@ -424,35 +428,38 @@ test cmdMZ-6.7.1 {Tcl_TimeRateObjCmd: return from timerate} {
     proc r1 {} {upvar x x; timerate {incr x; return "r1"; incr x} 1000 10}
     list [r1] $x
 } {r1 1}
-test cmdMZ-6.8 {Tcl_TimeRateObjCmd: allow (conditional) break from timerate} {
+test cmdMZ-6.8 {Tcl_TimeRateObjCmd: allow (conditional) break from timerate} -body {
     set m1 [timerate {break}]
-    list \
+    list [list \
 	[expr {[lindex $m1 0] < 1000}] \
 	[expr {[lindex $m1 2] == 1}] \
 	[expr {[lindex $m1 4] > 1000}] \
-	[expr {[lindex $m1 6] < 10}]
-} {1 1 1 1}
-test cmdMZ-6.8.1 {Tcl_TimeRateObjCmd: allow (conditional) continue in timerate} {
+	[expr {[lindex $m1 6] < 10}] \
+    ] $m1; # interesting only in error case.
+} -match glob -result [list {1 1 1 1} *]
+test cmdMZ-6.8.1 {Tcl_TimeRateObjCmd: allow (conditional) continue in timerate} -body {
     set m1 [timerate {continue; return -code error "unexpected"} 1000 10]
-    list \
+    list [list \
 	[expr {[lindex $m1 0] < 1000}] \
 	[expr {[lindex $m1 2] == 10}] \
 	[expr {[lindex $m1 4] > 1000}] \
-	[expr {[lindex $m1 6] < 100}]
-} {1 1 1 1}
+	[expr {[lindex $m1 6] < 100}] \
+    ] $m1; # interesting only in error case.
+} -match glob -result [list {1 1 1 1} *]
 test cmdMZ-6.9 {Tcl_TimeRateObjCmd: max count of iterations} {
     set m1 [timerate {} 1000 5];	# max-count wins
     set m2 [timerate {_nrt_sleep 20} 1 5];	# max-time wins
     list [lindex $m1 2] [lindex $m2 2]
 } {5 1}
-test cmdMZ-6.10 {Tcl_TimeRateObjCmd: huge overhead cause 0us result} {
+test cmdMZ-6.10 {Tcl_TimeRateObjCmd: huge overhead cause 0us result} -body {
     set m1 [timerate -overhead 1e6 {_nrt_sleep 10} 100 1]
-    list \
+    list [list \
 	[expr {[lindex $m1 0] == 0.0}] \
 	[expr {[lindex $m1 2] == 1}] \
 	[expr {[lindex $m1 4] == 1000000}] \
-	[expr {[lindex $m1 6] <= 0.001}]
-} {1 1 1 1}
+	[expr {[lindex $m1 6] <= 0.001}] \
+    ] $m1; # interesting only in error case.
+} -match glob -result [list {1 1 1 1} *]
 test cmdMZ-6.11 {Tcl_TimeRateObjCmd: done/continue optimization rollback} {
     set m1 {set m2 ok}
     if 1 $m1
diff --git a/tests/fileSystemEncoding.test b/tests/fileSystemEncoding.test
index fa67646..0f8a2a7 100644
--- a/tests/fileSystemEncoding.test
+++ b/tests/fileSystemEncoding.test
@@ -38,11 +38,12 @@ namespace eval ::tcl::test::fileSystemEncoding {
 	makeFile {} $utf8name
 	set globbed [lindex [glob -directory $dir *] 0]
 	encoding system utf-8
-	lappend res [file exists $globbed]
+	set res [file exists $globbed]
 	encoding system iso8859-1
 	lappend res [file exists $globbed]
 	return $res
     } -cleanup {
+	removeFile $utf8name
 	file delete -force $dir
 	encoding system $saved
     } -result  {0 1}
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index c3c8650..b0aa054 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -24,7 +24,7 @@ namespace eval ::tcltests {
 
 
     proc tempdir_alternate {} {
-	file tempfile tempfile
+	close [file tempfile tempfile]
 	set tmpdir [file dirname $tempfile]
 	set execname [info nameofexecutable]
 	regsub -all {[^[:alpha:][:digit:]]} $execname _ execname
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 82809e7..a64d136 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1025,9 +1025,9 @@ install-libraries: libraries
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
 	done
-	@echo "Installing package http 2.9.0 as a Tcl Module"
+	@echo "Installing package http 2.9.1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
-		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/http-2.9.0.tm
+		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/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 \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 290596f..574c920 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -4,9 +4,6 @@
     #ifndef _TCLCONFIG
     #define _TCLCONFIG
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Is gettimeofday() actually declared in <sys/time.h>? */
 #undef GETTOD_NOT_DECLARED
 
@@ -235,10 +232,10 @@
 /* Is 'struct stat64' in <sys/stat.h>? */
 #undef HAVE_STRUCT_STAT64
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
 /* Define to 1 if you have the <sys/epoll.h> header file. */
@@ -391,9 +388,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -463,17 +457,9 @@
 /* Should we use vfork() instead of fork()? */
 #undef USE_VFORK
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /* Are we building with zipfs enabled? */
 #undef ZIPFS_BUILD
@@ -531,7 +517,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define as int if socklen_t is not available */
diff --git a/win/Makefile.in b/win/Makefile.in
index 3bd0c33..14e0d35 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -863,8 +863,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
-	@echo "Installing package http 2.9.0 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/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)/../tcl9/9.0/http-2.9.1.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
diff --git a/win/rules.vc b/win/rules.vc
index eb32cfc..6081714 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 4

+RULES_VERSION_MINOR = 5

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -969,6 +969,19 @@ VERSION         = $(DOTVERSION:.=)
 

 !endif # $(DOING_TCL) ... etc.

 

+# Windows RC files have 3 version components. Ensure this irrespective

+# of how many components the package has specified. Basically, ensure

+# minimum 4 components by appending 4 0's and then pick out the first 4.

+# Also take care of the fact that DOTVERSION may have "a" or "b" instead

+# of "." separating the version components.

+DOTSEPARATED=$(DOTVERSION:a=.)

+DOTSEPARATED=$(DOTSEPARATED:b=.)

+!if [echo RCCOMMAVERSION = \> versions.vc] \

+  || [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]

+!error *** Could not generate RCCOMMAVERSION ***

+!endif

+!include versions.vc

+

 ################################################################

 # 10. Construct output directory and file paths

 # Figure-out how to name our intermediate and output directories.

@@ -1480,7 +1493,7 @@ GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
 RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

 	    $(TCL_INCLUDES) \

 	    /DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

-	    /DCOMMAVERSION=$(DOTVERSION:.=,),0 \

+	    /DCOMMAVERSION=$(RCCOMMAVERSION) \

 	    /DDOTVERSION=\"$(DOTVERSION)\" \

 	    /DVERSION=\"$(VERSION)\" \

 	    /DSUFX=\"$(SUFX:t=)\" \