keep changes and mmns in sync.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99200 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 67e0b23ec1b64761fe18e47faf15decce82cb1a6..b2f2fe81d44fb890293b2f515f4323a67af934ce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -35,17 +35,6 @@ Changes with Apache 2.1.0-dev
      the current locale. level values are now really parsed as integers.
      PR 17564.  [André Malo]
 
-  *) mod_deflate: Check also err_headers_out for an already set
-     Content-Encoding: gzip header. This prevents gzip compressed content
-     from a CGI script from being compressed once more. PR 17797.
-     [André Malo]
-
-  *) Forward port: Escape special characters (especially control
-     characters) in mod_log_config to make a clear distinction between
-     client-supplied strings (with special characters) and server-side
-     strings. This was already introduced in version 1.3.25.
-     [André Malo]
-
   *) Linux 2.4+: enable coredumps when Apache is started as root
      if CoreDumpDir is configured [Greg Ames]
 
@@ -157,6 +146,19 @@ Changes with Apache 2.1.0-dev
   [Apache 2.1.0-dev includes those bug fixes and changes with the
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
+Changes with Apache 2.0.46
+
+  *) Forward port: Escape special characters (especially control
+     characters) in mod_log_config to make a clear distinction between
+     client-supplied strings (with special characters) and server-side
+     strings. This was already introduced in version 1.3.25.
+     [André Malo]
+
+  *) mod_deflate: Check also err_headers_out for an already set
+     Content-Encoding: gzip header. This prevents gzip compressed content
+     from a CGI script from being compressed once more. PR 17797.
+     [André Malo]
+
 Changes with Apache 2.0.45
 
   *) Fix possible segfaults under obscure error conditions within the

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 9e029cfc30cbe20264209dc9b10e4aeb02b2bf2c..a87538e08c74f1d4c3faddfe8d83014cae506f30 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -112,9 +112,9 @@
  * 20020628 (2.0.40-dev) Added filter_init to filter registration functions
  * 20020903 (2.0.41-dev) APR's error constants changed
  * 20020903.1 (2.1.0-dev) allow_encoded_slashes added to core_dir_config
+ * 20020903.2 (2.0.46-dev) add ap_escape_logitem
  * 20030213.1 (2.1.0-dev) changed log_writer optional fn's to return previous
  *                        handler
- * 20030213.2 (2.1.0-dev) add ap_escape_logitem
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
@@ -122,7 +122,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20030213
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 2                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a