bk commit into 4.1 tree (lenz:1.2351)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2351 05/07/27 14:55:08 lenz@stripped +1 -0
  - applied a security fix to inftrees.h from the bundled zlib to resolve a second
    potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
    official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)

  zlib/inftrees.h
    1.3 05/07/27 14:54:58 lenz@stripped +5 -5
    - applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib
      sources

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build

--- 1.2/zlib/inftrees.h	2004-07-22 02:36:06 +02:00
+++ 1.3/zlib/inftrees.h	2005-07-27 14:54:58 +02:00
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -36,12 +36,12 @@
  */
 
 /* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 code structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
    exhaustive search).  The true maximum is not known, but the value
    below is more than safe. */
-#define ENOUGH 1440
-#define MAXD 154
+#define ENOUGH 2048
+#define MAXD 592
 
 /* Type of code to build for inftable() */
 typedef enum {