[Bug 3601086]: Register zlib config as iso8859-1 (a superset of ascii) as that

is an encoding we guarantee to support without loading encoding files.

2 files changed, 31 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index fa41721..968057f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2013-01-16  Donal K. Fellows  <dkf@users.sf.net>
+
+	* generic/tclZlib.c (TclZlibInit): [Bug 3601086]: Register the config
+	info in the iso8859-1 encoding as that is guaranteed to be present.
+
 2013-01-16  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* Makefile.in: Enable win32 build with -DTCL_NO_DEPRECATED, just
-	* generic/tcl.h: as the UNIX build. Define Tcl_EvalObj and
+	* Makefile.in:   Enable win32 build with -DTCL_NO_DEPRECATED, just as
+	* generic/tcl.h: in the UNIX build. Define Tcl_EvalObj and
 	* generic/tclDecls.h: Tcl_GlobalEvalObj as macros, even when
-	* generic/tclBasic.c: TCL_NO_DEPRECATED is defined, so Tk
-	can benefit from it too.
+	* generic/tclBasic.c: TCL_NO_DEPRECATED is defined, so Tk can benefit
+	from it too.
 
 2013-01-15  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -13,35 +18,36 @@
 
 2013-01-14  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* win/tcl.m4: More flexible search for win32 tclConfig.sh,
-	backported from TEA (not actually used in Tcl, only for Tk)
+	* win/tcl.m4: More flexible search for win32 tclConfig.sh, backported
+	from TEA (not actually used in Tcl, only for Tk)
 
 2013-01-14  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tclInt.decls: Put back Tcl_[GS]etStartupScript in
-	internal stub table, so extensions using this, compiled
-	against 8.5 headers still run in Tcl 8.6.
+	* generic/tclInt.decls: Put back Tcl_[GS]etStartupScript in internal
+	stub table, so extensions using this, compiled against 8.5 headers
+	still run in Tcl 8.6.
 
 2013-01-13  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-	* doc/fileevent.n: Clarify readable fileevent "false positives" in
-	the case of multibyte encodings/transforms [Bug 3436609].
+
+	* doc/fileevent.n: [Bug 3436609]: Clarify readable fileevent "false
+	positives" in the case of multibyte encodings/transforms.
 
 2013-01-13  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tclIntDecls.h: If TCL_NO_DEPRECATED is defined, make
-	sure that TIP #139 functions all are taken from the public stub
-	table, even if the inclusion is through tclInt.h.
+	* generic/tclIntDecls.h: If TCL_NO_DEPRECATED is defined, make sure
+	that TIP #139 functions all are taken from the public stub table, even
+	if the inclusion is through tclInt.h.
 
 2013-01-12  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tclInt.decls: Put back TclBackgroundException in
-	internal stub table, so extensions using this, compiled
-	against 8.5 headers still run in Tcl 8.6.
+	* generic/tclInt.decls: Put back TclBackgroundException in internal
+	stub table, so extensions using this, compiled against 8.5 headers
+	still run in Tcl 8.6.
 
 2013-01-09  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* library/http/http.tcl: [Bug 3599395]: http assumes status line
-	is a proper tcl list.
+	* library/http/http.tcl: [Bug 3599395]: http assumes status line is a
+	proper Tcl list.
 
 2013-01-08  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -52,10 +58,10 @@
 2013-01-07  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclOOStubLib.c: Restrict the stub library to only use
-	* generic/tclTomMathStubLib.c: Tcl_PkgRequireEx, Tcl_ResetResult
-	and Tcl_AppendResult, not any other function. This puts least
-	restrictions on eventual Tcl 9 stubs re-organization, and it
-	works on the widest range of Tcl versions.
+	* generic/tclTomMathStubLib.c: Tcl_PkgRequireEx, Tcl_ResetResult and
+	Tcl_AppendResult, not any other function. This puts least restrictions
+	on eventual Tcl 9 stubs re-organization, and it works on the widest
+	range of Tcl versions.
 
 2013-01-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -4152,6 +4158,7 @@
 	* generic/*Decls.h:   (regenerated)
 
 2010-08-18  Miguel Sofer  <msofer@users.sf.net>
+
 	* generic/tclBasic.c:   New redesign of [tailcall]: find
 	* generic/tclExecute.c: errors early on, so that errorInfo
 	* generic/tclInt.h:     contains the proper info [Bug 3047235]
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 9c1176e..47091de 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -3865,7 +3865,7 @@ TclZlibInit(
     cfg[0].key = "zlibVersion";
     cfg[0].value = zlibVersion();
     cfg[1].key = NULL;
-    Tcl_RegisterConfig(interp, "zlib", cfg, "ascii");
+    Tcl_RegisterConfig(interp, "zlib", cfg, "iso8859-1");
 
     /*
      * Formally provide the package as a Tcl built-in.