---
en-US/The_Apache_HTTP_Server.xml | 110 +++++++++++++++++++++++++++++----------
1 file changed, 83 insertions(+), 27 deletions(-)

diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index d64c8e9..7f74d6b 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -8,20 +8,20 @@
<see><application>Apache HTTP Server</application></see>
</indexterm>
<para>
- This section focuses on the <application>Apache HTTP Server 2.2</application>, a robust, full-featured open source web server developed by the <ulink url="http://www.apache.org/">Apache Software Foundation</ulink>, that is included in &MAJOROSVER;. It describes the basic configuration of the <systemitem class="service">httpd</systemitem> service, and covers advanced topics such as adding server modules, setting up virtual hosts, or configuring the secure HTTP server.
+ This section focuses on the <application>Apache HTTP Server 2.4</application>, a robust, full-featured open source web server developed by the <ulink url="http://www.apache.org/">Apache Software Foundation</ulink>, that is included in &MAJOROSVER;. It describes the basic configuration of the <systemitem class="service">httpd</systemitem> service, and covers advanced topics such as adding server modules, setting up virtual hosts, or configuring the secure HTTP server.
</para>
<para>
- There are important differences between the Apache HTTP Server 2.2 and version 2.0, and if you are upgrading from a previous release of &MAJOROS;, you will need to update the <systemitem class="service">httpd</systemitem> service configuration accordingly. This section reviews some of the newly added features, outlines important changes, and guides you through the update of older configuration files.
+ There are important differences between the Apache HTTP Server 2.2 and version 2.4, and if you are upgrading from a previous release of &MAJOROS;, you will need to update the <systemitem class="service">httpd</systemitem> service configuration accordingly. This section reviews some of the newly added features, outlines important changes, and guides you through the update of older configuration files.
</para>
<section id="s2-apache-version2-features">
<title>New Features</title>
<indexterm>
<primary><application>Apache HTTP Server</application></primary>
- <secondary>version 2.2</secondary>
+ <secondary>version 2.4</secondary>
<tertiary>features</tertiary>
</indexterm>
<para>
- The Apache HTTP Server version 2.2 introduces the following enhancements:
+ The Apache HTTP Server version 2.4 introduces the following enhancements:
</para>
<itemizedlist>
<listitem>
@@ -59,18 +59,70 @@
A new structure for authentication and authorization support, replacing the authentication modules provided in previous versions.
</para>
</listitem>
+ <listitem>
+ <para>
+ Multiple MPMs can now be built as loadable modules at compile time. The MPM of choice can be configured at run time.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary><application>Apache HTTP Server</application></primary>
+ <secondary>core enhancements</secondary>
+ <tertiary><systemitem class="resource">LogLevel</systemitem></tertiary>
+ </indexterm>
+ The LogLevel can now be configured per module and per directory. New levels trace1 to trace8 have been added above the debug log level.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary><application>Apache HTTP Server</application></primary>
+ <secondary>core enhancements</secondary>
+ <tertiary><systemitem class="resource">SetEnvIfExpr</systemitem></tertiary>
+ </indexterm>
+ <indexterm>
+ <primary><application>Apache HTTP Server</application></primary>
+ <secondary>core enhancements</secondary>
+ <tertiary><systemitem class="resource">RewriteCond</systemitem></tertiary>
+ </indexterm>
+ A new expression parser allows to specify complex conditions using a common syntax in directives like <systemitem class="resource">SetEnvIfExpr</systemitem>, <systemitem class="resource">RewriteCond</systemitem>, Header, If, and others. + </para>
+ </listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary><application>Apache HTTP Server</application></primary>
+ <secondary>core enhancements</secondary>
+ <tertiary><systemitem class="resource">.htaccess</systemitem></tertiary>
+ </indexterm>
+ The new AllowOverrideList directive allows more fine grained control which directives are allowed in <systemitem class="resource">.htaccess</systemitem> files. + </para>
+ </listitem>
+<listitem>
+ <para>
+ <indexterm>
+ <primary><application>Apache HTTP Server</application></primary>
+ <secondary>core enhancements</secondary>
+ <tertiary>Reduced memory usage</tertiary>
+ </indexterm>
+ Apache 2.4.x tends to use less memory than 2.2.x. + </para>
+ </listitem>
</itemizedlist>
</section>
<section id="s2-apache-version2-changes">
<title>Notable Changes</title>
<indexterm>
<primary><application>Apache HTTP Server</application></primary>
- <secondary>version 2.2</secondary>
+ <secondary>version 2.4</secondary>
<tertiary>changes</tertiary>
</indexterm>
<para>
- Since version 2.0, few changes have been made to the default <systemitem class="service">httpd</systemitem> service configuration:
+ Since version 2.4, few changes have been made to the default <systemitem class="service">httpd</systemitem> service configuration:
</para>
+
+ 
<itemizedlist>
<listitem>
<para>
@@ -98,16 +150,17 @@
</para>
</listitem>
</itemizedlist>
+
</section>
<section id="s2-apache-version2-migrating">
<title>Updating the Configuration</title>
<indexterm>
<primary><application>Apache HTTP Server</application></primary>
- <secondary>version 2.2</secondary>
- <tertiary>updating from version 2.0</tertiary>
+ <secondary>version 2.4</secondary>
+ <tertiary>updating from version 2.4</tertiary>
</indexterm>
<para>
- To update the configuration files from the Apache HTTP Server version 2.0, take the following steps:
+ To update the configuration files from the Apache HTTP Server version 2.4, take the following steps:
</para>
<procedure>
<step>
@@ -141,7 +194,7 @@
</para>
<screen><command>service httpd configtest</command></screen>
<para>
- For more information on upgrading the Apache HTTP Server configuration from version 2.0 to 2.2, refer to <ulink url="http://httpd.apache.org/docs/2.2/upgrading.html" />.
+ For more information on upgrading the Apache HTTP Server configuration from version 2.2 to 2.4, refer to <ulink url="http://httpd.apache.org/docs/2.4/upgrading.html" />.
</para>
</section>
<section id="s2-apache-running">
@@ -223,6 +276,8 @@
This will cause the running <systemitem class="service">httpd</systemitem> service to reload the configuration file. Note that any requests being currently processed will be interrupted, which may cause a client browser to display an error message or render a partial page.
</para>
</listitem>
+
+ 
<listitem>
<para>
To reload the configuration without affecting active requests, run the following command as <systemitem class="username">root</systemitem>:
@@ -233,6 +288,7 @@
</para>
</listitem>
</orderedlist>
+
<para>
Refer to <xref linkend="ch-Services_and_Daemons" /> for more information on how to configure services in &MAJOROS;.
</para>
@@ -2987,7 +3043,7 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<option>Minor</option>
</entry>
<entry>
- Includes the product name and the minor version of the server (for example, <literal>2.2</literal>).
+ Includes the product name and the minor version of the server (for example, <literal>2.4</literal>).
</entry>
</row>
<row>
@@ -2995,7 +3051,7 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<option>Min</option>
</entry>
<entry>
- Includes the product name and the minimal version of the server (for example, <literal>2.2.15</literal>).
+ Includes the product name and the minimal version of the server (for example, <literal>2.4.15</literal>).
</entry>
</row>
<row>
@@ -3407,21 +3463,21 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<indexterm>
<primary><application>Apache HTTP Server</application></primary>
<secondary>directives</secondary>
- <tertiary><option>MaxClients</option></tertiary>
+ <tertiary><option>MaxRequestWorkers</option></tertiary>
</indexterm>
- <option>MaxClients</option>
+ <option>MaxRequestWorkers</option>
</term>
<listitem>
<para>
- The <option>MaxClients</option> directive allows you to specify the maximum number of simultaneously connected clients to process at one time. It takes the following form:
+ The <option>MaxRequestWorkers</option> directive allows you to specify the maximum number of simultaneously connected clients to process at one time. It takes the following form:
</para>
- <programlisting>MaxClients <replaceable>number</replaceable></programlisting>
+ <programlisting>MaxRequestWorkers <replaceable>number</replaceable></programlisting>
<para>
A high <replaceable>number</replaceable> can improve the performance of the server, although it is not recommended to exceed <literal>256</literal> when using the <systemitem class="resource">prefork</systemitem> MPM.
</para>
- <example id="example-apache-mpm-maxclients">
- <title>Using the MaxClients directive</title>
- <programlisting>MaxClients 256</programlisting>
+ <example id="example-apache-mpm-maxrequestworkers">
+ <title>Using the MaxRequestWorkers directive</title>
+ <programlisting>MaxRequestWorkers 256</programlisting>
</example>
</listitem>
</varlistentry>
@@ -3430,24 +3486,24 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<indexterm>
<primary><application>Apache HTTP Server</application></primary>
<secondary>directives</secondary>
- <tertiary><option>MaxClients</option></tertiary>
+ <tertiary><option>MaxRequestWorkers</option></tertiary>
</indexterm>
- <option>MaxRequestsPerChild</option>
+ <option> MaxConnectionsPerChild</option>
</term>
<listitem>
<para>
- The <option>MaxRequestsPerChild</option> directive allows you to specify the maximum number of request a child process can serve before it dies. It takes the following form:
+ The <option> MaxConnectionsPerChild</option> directive allows you to specify the maximum number of request a child process can serve before it dies. It takes the following form:
</para>
- <programlisting>MaxRequestsPerChild <replaceable>number</replaceable></programlisting>
+ <programlisting> MaxConnectionsPerChild <replaceable>number</replaceable></programlisting>
<para>
Setting the <replaceable>number</replaceable> to <literal>0</literal> allows unlimited number of requests.
</para>
<para>
- The <option>MaxRequestsPerChild</option> directive is used to prevent long-lived processes from causing memory leaks.
+ The <option> MaxConnectionsPerChild</option> directive is used to prevent long-lived processes from causing memory leaks.
</para>
- <example id="example-apache-mpm-maxrequestsperchild">
- <title>Using the MaxRequestsPerChild directive</title>
- <programlisting>MaxRequestsPerChild 4000</programlisting>
+ <example id="example-apache-mpm-maxconnectionsperchild">
+ <title>Using the MaxConnectionsPerChild directive</title>
+ <programlisting> MaxConnectionsPerChild 4000</programlisting>
</example>
</listitem>
</varlistentry>
--
1.8.4.2