reflect backport of mod_deflate.c r1.31

change directive from compressionlevel to deflatecompressionlevel

PR:
Obtained from:
Submitted by:	Ian Holsman, Andre Malo
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index db2151c37f54d06b9774a5f8aea10399e2baa7f4..afa48485ffeea1cf120712515a72d51be459338a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) change directive name from 'compressionlevel' to 'deflatecompressionlevel'
+     [Ian Holsman, André Malo]]
+
   *) mod_negotiation: quality values are now parsed independent from
      the current locale. level values are now really parsed as integers.
      PR 17564.  [André Malo]
@@ -20,10 +23,6 @@ Changes with Apache 2.1.0-dev
   *) Linux 2.4+: enable coredumps when Apache is started as root
      if CoreDumpDir is configured [Greg Ames]
 
-  *) you can now specify the compression level for mod_deflate. 
-     [Ian Holsman, Stephen Pierzchala <stephen@pierzchala.com>, 
-     Michael Schroepl <Michael.Schroepl@telekurs.de>]
-
   *) Added the WindowsSocketsWorkaround directive for Windows NT/2000/XP
      to work around problems with certain VPN and Firewall products that 
      have buggy AcceptEx implementations.
@@ -127,10 +126,6 @@ Changes with Apache 2.1.0-dev
   *) Replace some of the mutex locking in the worker MPM with
      atomic operations for higher concurrency.  [Brian Pane]
 
-  *) mod_deflate: Extend the DeflateFilterNote directive to
-     allow accurate logging of the filter's in- and outstream.
-     [André Malo]
-
   *) Allow 'make depend' to work with non-GCC compilers.
      [Justin Erenkrantz]
 
@@ -164,6 +159,14 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.45
 
+  *) you can now specify the compression level for mod_deflate. 
+     [Ian Holsman, Stephen Pierzchala <stephen@pierzchala.com>, 
+     Michael Schroepl <Michael.Schroepl@telekurs.de>]
+
+  *) mod_deflate: Extend the DeflateFilterNote directive to
+     allow accurate logging of the filter's in- and outstream.
+     [André Malo]
+
   *) Allow SSLMutex to select/use the full range of APR locking
      mechanisms available to it. Also, fix the bug that SSLMutex uses
      APR_LOCK_DEFAULT no matter what.  PR 8122  [Jim Jagielski,

diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index e462a878b1ca7f6981ead092c15da2a43fba155d..8d7c903205a6612add3c3eddc95fedd5019ebf6e 100644 (file)
--- a/docs/manual/mod/mod_deflate.xml
+++ b/docs/manual/mod/mod_deflate.xml
@@ -193,7 +193,7 @@ client</description>
 <syntax>DeflateFilterNote [<var>type</var>] <var>notename</var></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
-<compatibility><var>type</var> is available since Apache 2.1</compatibility>
+<compatibility><var>type</var> is available since Apache 2.0.45</compatibility>
 
 <usage>
     <p>The <directive>DeflateFilterNote</directive> directive
@@ -288,15 +288,16 @@ client</description>
 </directivesynopsis>
 
 <directivesynopsis>
-<name>CompressionLevel</name>
+<name>DeflateCompressionLevel</name>
 <description>How much compression do we apply to the output</description>
-<syntax>CompressionLevel<var>value</var></syntax>
+<syntax>DeflateCompressionLevel<var>value</var></syntax>
 <default>Zlib's default</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
+<compatibility>This directive is available since Apache 2.0.45</compatibility>
 
 <usage>
-    <p>The <directive>CompressionLevel</directive> directive specifies
+    <p>The <directive>DeflateCompressionLevel</directive> directive specifies
         what level of compression should be used, the higher the value, 
         the better the compression, but the more CPU time is required to
         achieve this.</p>

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index db65bd2f248c3e74dfff7f04ea568aaf7b41d781..c8d8ae9b0dfba3e57245f7098bf4fe4b28574dd8 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -854,7 +854,7 @@ static const command_rec deflate_filter_cmds[] = {
                   "Set the Deflate Buffer Size"),
     AP_INIT_TAKE1("DeflateMemLevel", deflate_set_memlevel, NULL, RSRC_CONF,
                   "Set the Deflate Memory Level (1-9)"),
-    AP_INIT_TAKE1("CompressionLevel", deflate_set_compressionlevel, NULL, RSRC_CONF,
+    AP_INIT_TAKE1("DeflateCompressionLevel", deflate_set_compressionlevel, NULL, RSRC_CONF,
                   "Set the Deflate Compression Level (1-9)"),
     {NULL}
 };