You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ia...@apache.org on 2003/03/11 19:11:35 UTC
cvs commit: httpd-2.0/docs/manual/mod mod_deflate.xml
ianh 2003/03/11 10:11:33
Modified: . CHANGES
modules/filters mod_deflate.c
docs/manual/mod mod_deflate.xml
Log:
reflect backport of mod_deflate.c r1.31
change directive from compressionlevel to deflatecompressionlevel
Submitted by: Ian Holsman, Andre Malo
Revision Changes Path
1.1118 +11 -8 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1117
retrieving revision 1.1118
diff -u -r1.1117 -r1.1118
--- CHANGES 11 Mar 2003 06:39:26 -0000 1.1117
+++ CHANGES 11 Mar 2003 18:11:28 -0000 1.1118
@@ -2,6 +2,9 @@
[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 @@
*) 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 <st...@pierzchala.com>,
- Michael Schroepl <Mi...@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 @@
*) 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]
@@ -163,6 +158,14 @@
Apache 2.0.xx tree as documented, and except as noted, below.]
Changes with Apache 2.0.45
+
+ *) you can now specify the compression level for mod_deflate.
+ [Ian Holsman, Stephen Pierzchala <st...@pierzchala.com>,
+ Michael Schroepl <Mi...@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
1.33 +1 -1 httpd-2.0/modules/filters/mod_deflate.c
Index: mod_deflate.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_deflate.c 8 Mar 2003 17:08:34 -0000 1.32
+++ mod_deflate.c 11 Mar 2003 18:11:33 -0000 1.33
@@ -854,7 +854,7 @@
"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}
};
1.16 +5 -4 httpd-2.0/docs/manual/mod/mod_deflate.xml
Index: mod_deflate.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_deflate.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_deflate.xml 5 Mar 2003 22:14:33 -0000 1.15
+++ mod_deflate.xml 11 Mar 2003 18:11:33 -0000 1.16
@@ -193,7 +193,7 @@
<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 @@
</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>