From cvs-return-15401-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Fri Apr 04 01:10:57 2003 Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 81807 invoked by uid 500); 4 Apr 2003 01:10:57 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 81796 invoked by uid 500); 4 Apr 2003 01:10:57 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 4 Apr 2003 01:10:56 -0000 Message-ID: <20030404011056.4073.qmail@icarus.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/include ap_mmn.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N nd 2003/04/03 17:10:56 Modified: . CHANGES include ap_mmn.h Log: keep changes and mmns in sync. Revision Changes Path 1.1135 +13 -11 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.1134 retrieving revision 1.1135 diff -u -r1.1134 -r1.1135 --- CHANGES 3 Apr 2003 11:52:07 -0000 1.1134 +++ CHANGES 4 Apr 2003 01:10:55 -0000 1.1135 @@ -35,17 +35,6 @@ 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] @@ -156,6 +145,19 @@ [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 1.58 +2 -2 httpd-2.0/include/ap_mmn.h Index: ap_mmn.h =================================================================== RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- ap_mmn.h 6 Mar 2003 23:53:51 -0000 1.57 +++ ap_mmn.h 4 Apr 2003 01:10:56 -0000 1.58 @@ -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