[apache2] 01/01: Pull from upstream 2.4.x branch up to r1632831
Stefan Fritsch
sf at moszumanska.debian.org
Sat Oct 18 19:56:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apache2.
commit 138b07d3ddde04ea7fa58cccdb77cafc0e2b8634
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sat Oct 18 21:49:15 2014 +0200
Pull from upstream 2.4.x branch up to r1632831
Several bug fixes, including a LDAP regression fix, plus many docs
updates.
Makes CVE-2014-3581.patch obsolete.
---
debian/changelog | 5 +
debian/patches/CVE-2014-3581.patch | 37 -
debian/patches/pull_upstream_2.4.x_branch.patch | 3167 ++++++++++++++++++-----
debian/patches/series | 1 -
4 files changed, 2552 insertions(+), 658 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6982843..02fd44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
apache2 (2.4.10-6) UNRELEASED; urgency=medium
* Disable SSLv3 in default config. Closes: #765347
+ * Pull changes from upstream 2.4.x branch up to r1632831
+ - Fixes an LDAP regression in 2.4.10
+ - mod_cache: Avoid sending 304 responses during failed revalidations.
+ PR 56881
+ - mod_status: Honor client IP address using mod_remoteip. PR 55886
-- Stefan Fritsch <sf at debian.org> Tue, 14 Oct 2014 22:23:40 +0200
diff --git a/debian/patches/CVE-2014-3581.patch b/debian/patches/CVE-2014-3581.patch
deleted file mode 100644
index c0d3499..0000000
--- a/debian/patches/CVE-2014-3581.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-#commit c164ca7383d5f204915d85a5826655d3f1557148
-#Author: Jim Jagielski <jim at apache.org>
-#Date: Fri Sep 26 11:00:14 2014 +0000
-#
-# Merge r1624234 from trunk:
-#
-# SECURITY (CVE-2014-3581): Fix a mod_cache NULL pointer deference
-# in Content-Type handling.
-#
-# mod_cache: Avoid a crash when Content-Type has an empty value. PR56924.
-#
-# Submitted By: Mark Montague <mark catseye.org>
-# Reviewed By: Jan Kaluza
-#
-# Submitted by: jkaluza
-# Reviewed/backported by: jim
-#
-#
-# git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1627749 13f79535-47bb-0310-9956-ffa450edef68
-#
-diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
-index 6368af0..b7454ad 100644
---- a/modules/cache/cache_util.c
-+++ b/modules/cache/cache_util.c
-@@ -1258,8 +1258,10 @@ apr_table_t *cache_merge_headers_out(request_rec *r)
-
- if (r->content_type
- && !apr_table_get(headers_out, "Content-Type")) {
-- apr_table_setn(headers_out, "Content-Type",
-- ap_make_content_type(r, r->content_type));
-+ const char *ctype = ap_make_content_type(r, r->content_type);
-+ if (ctype) {
-+ apr_table_setn(headers_out, "Content-Type", ctype);
-+ }
- }
-
- if (r->content_encoding
diff --git a/debian/patches/pull_upstream_2.4.x_branch.patch b/debian/patches/pull_upstream_2.4.x_branch.patch
index 0b0955c..61bc78f 100644
--- a/debian/patches/pull_upstream_2.4.x_branch.patch
+++ b/debian/patches/pull_upstream_2.4.x_branch.patch
@@ -1,17 +1,49 @@
-Description: pull changes from upstream svn 2.4 branch up to r1626207
+Description: pull changes from upstream svn 2.4 branch up to r1632831
Forwarded: not-needed
Author: Stefan Fritsch <sf at debian.org>
Last-Update: 2014-09-20
-diff --git a/CHANGES b/CHANGES
-index 14ede61..4d864ac 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,15 +1,52 @@
+--- apache2.orig/CHANGES
++++ apache2/CHANGES
+@@ -1,15 +1,79 @@
-*- coding: utf-8 -*-
+Changes with Apache 2.4.11
+
++ *) SECURITY: CVE-2014-3581 (cve.mitre.org)
++ mod_cache: Avoid a crash when Content-Type has an empty value.
++ PR 56924. [Mark Montague <mark catseye.org>, Jan Kaluza]
++
++ *) SECURITY: CVE-2013-5704 (cve.mitre.org)
++ core: HTTP trailers could be used to replace HTTP headers
++ late during request processing, potentially undoing or
++ otherwise confusing modules that examined or modified
++ request headers earlier. Adds "MergeTrailers" directive to restore
++ legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
++
++ *) mod_proxy_http: Avoid (unlikely) access to freed memory. [Yann Ylavic]
++
++ *) http_protocol: fix logic in ap_method_list_(add|remove) in order:
++ - to correctly reset bits
++ - not to modify the 'method_mask' bitfield unnecessarily
++ [Christophe Jaillet]
++
++ *) mod_slotmem_shm: Increase log level for some originally debug messages.
++ [Jim Jagielski]
++
++ *) mod_ldap: In 2.4.10, some LDAP searches or comparisons might be done with
++ the wrong credentials when a backend connection is reused.
++ [Eric Covener]
++
++ *) mod_macro: Add missing APLOGNO for some Warning log messages.
++ [Christophe Jaillet]
++
++ *) mod_cache: Avoid sending 304 responses during failed revalidations
++ PR56881. [Eric Covener]
++
++ *) mod_status: Honor client IP address using mod_remoteip. PR 55886.
++ [Jim Jagielski]
++
+ *) cmake-based build for Windows: Fix incompatibility with cmake 2.8.12
+ and later. PR 56615. [Chuck Liu <cliu81 gmail.com>, Jeff Trawick]
+
@@ -30,13 +62,6 @@ index 14ede61..4d864ac 100644
+ "ProxyErrorOverride On" hang until proxy timeout.
+ PR53420 [Rainer Jung]
+
-+ *) SECURITY: CVE-2013-5704 (cve.mitre.org)
-+ core: HTTP trailers could be used to replace HTTP headers
-+ late during request processing, potentially undoing or
-+ otherwise confusing modules that examined or modified
-+ request headers earlier. Adds "MergeTrailers" directive to restore
-+ legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
-+
+ *) mod_log_config: Allow three character log formats to be registered. For
+ backwards compatibility, the first character of a three-character format
+ must be the '^' (caret) character. [Eric Covener]
@@ -65,7 +90,7 @@ index 14ede61..4d864ac 100644
[Jeff Trawick]
*) SECURITY: CVE-2014-0226 (cve.mitre.org)
-@@ -18,8 +55,8 @@ Changes with Apache 2.4.10
+@@ -18,8 +82,8 @@ Changes with Apache 2.4.10
*) SECURITY: CVE-2014-0118 (cve.mitre.org)
mod_deflate: The DEFLATE input filter (inflates request bodies) now
@@ -76,7 +101,7 @@ index 14ede61..4d864ac 100644
DeflateInflateLimitRequestBody, DeflateInflateRatioLimit,
and DeflateInflateRatioBurst. [Yann Ylavic, Eric Covener]
-@@ -244,7 +281,6 @@ Changes with Apache 2.4.10
+@@ -244,7 +308,6 @@ Changes with Apache 2.4.10
*) mod_lua: More verbose error logging when a handler function cannot be
found. [Daniel Gruno]
@@ -84,7 +109,7 @@ index 14ede61..4d864ac 100644
Changes with Apache 2.4.9
*) mod_ssl: Work around a bug in some older versions of OpenSSL that
-@@ -536,7 +572,8 @@ Changes with Apache 2.4.7
+@@ -536,7 +599,8 @@ Changes with Apache 2.4.7
- Avoid some memory allocation and work when TRACE1 is not activated
- fix typo in include guard
- indent
@@ -94,10 +119,8 @@ index 14ede61..4d864ac 100644
- Save a few cycles
[Christophe Jaillet <christophe.jaillet wanadoo.fr>]
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d3d16e5..71559a3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+--- apache2.orig/CMakeLists.txt
++++ apache2/CMakeLists.txt
@@ -80,11 +80,11 @@ FOREACH(onelib ${APR_LIBRARIES})
ENDFOREACH()
@@ -113,10 +136,8 @@ index d3d16e5..71559a3 100644
SET(${output_definition} "-D${input_symbol}=\"\\\"${input_value}\\\"\"")
ENDIF()
ENDMACRO()
-diff --git a/README.platforms b/README.platforms
-index 061a4e3..a377079 100644
---- a/README.platforms
-+++ b/README.platforms
+--- apache2.orig/README.platforms
++++ apache2/README.platforms
@@ -18,28 +18,9 @@
well as the fact that the bundled versions are up-to-date:
autoconf 2.52 and (g)libtool 1.4.2.
@@ -162,11 +183,9 @@ index 061a4e3..a377079 100644
==========
FreeBSD:
-diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
-index db38ff6..4c19a63 100644
---- a/build/NWGNUtail.inc
-+++ b/build/NWGNUtail.inc
-@@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
+--- apache2.orig/build/NWGNUtail.inc
++++ apache2/build/NWGNUtail.inc
+@@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
$(call DEL,$@)
$(call DEL,$(@:.opt=.def))
@echo $(DL)GEN $@$(DL)
@@ -183,10 +202,8 @@ index db38ff6..4c19a63 100644
@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
ifneq "$(NLM_CHECK_SYM)" ""
-diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8
-index 53388a9..8b6782b 100644
---- a/docs/man/rotatelogs.8
-+++ b/docs/man/rotatelogs.8
+--- apache2.orig/docs/man/rotatelogs.8
++++ apache2/docs/man/rotatelogs.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
@@ -196,7 +213,7 @@ index 53388a9..8b6782b 100644
.SH NAME
rotatelogs \- Piped logging program to rotate Apache logs
-@@ -68,7 +68,7 @@ Create log file for each interval, even if empty\&.
+@@ -68,7 +68,7 @@ Create log file for each interval, even
Use a circular list of filenames without timestamps\&. With -n 3, the series of log files opened would be "logfile", "logfile\&.1", "logfile\&.2", then overwriting "logfile"\&. Available in 2\&.4\&.5 and later\&.
.TP
\fIlogfile\fR
@@ -205,7 +222,7 @@ index 53388a9..8b6782b 100644
.TP
\fIrotationtime\fR
The time between log file rotations in seconds\&. The rotation occurs at the beginning of this interval\&. For example, if the rotation time is 3600, the log file will be rotated at the beginning of every hour; if the rotation time is 86400, the log file will be rotated every night at midnight\&. (If no data is logged during an interval, no file will be created\&.)
-@@ -83,25 +83,25 @@ The number of minutes offset from UTC\&. If omitted, zero is assumed and UTC is
+@@ -83,25 +83,25 @@ The number of minutes offset from UTC\&.
.nf
@@ -236,7 +253,7 @@ index 53388a9..8b6782b 100644
.fi
-@@ -110,7 +110,7 @@ This configuration will rotate the logfile whenever it reaches a size of 5 megab
+@@ -110,7 +110,7 @@ This configuration will rotate the logfi
.nf
@@ -245,7 +262,7 @@ index 53388a9..8b6782b 100644
.fi
-@@ -119,12 +119,12 @@ This configuration will rotate the error logfile whenever it reaches a size of 5
+@@ -119,12 +119,12 @@ This configuration will rotate the error
.nf
@@ -260,11 +277,9 @@ index 53388a9..8b6782b 100644
.SH "PORTABILITY"
-diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
-index 10ab0b5..6f1c334 100644
---- a/docs/manual/convenience.map
-+++ b/docs/manual/convenience.map
-@@ -154,6 +154,7 @@ cachestaleonerror mod/mod_cache.html#cachestaleonerror
+--- apache2.orig/docs/manual/convenience.map
++++ apache2/docs/manual/convenience.map
+@@ -154,6 +154,7 @@ cachestaleonerror mod/mod_cache.html#cac
cachestoreexpired mod/mod_cache.html#cachestoreexpired
cachestorenostore mod/mod_cache.html#cachestorenostore
cachestoreprivate mod/mod_cache.html#cachestoreprivate
@@ -282,7 +297,16 @@ index 10ab0b5..6f1c334 100644
deflatememlevel mod/mod_deflate.html#deflatememlevel
deflatewindowsize mod/mod_deflate.html#deflatewindowsize
deny mod/mod_access_compat.html#deny
-@@ -337,6 +341,7 @@ maxrequestworkers mod/mpm_common.html#maxrequestworkers
+@@ -213,7 +217,7 @@ error mod/core.html#error
+ errordocument mod/core.html#errordocument
+ errorlog mod/core.html#errorlog
+ errorlogformat mod/core.html#errorlogformat
+-example mod/mod_example.html#example
++example mod/mod_example_hooks.html#example
+ expiresactive mod/mod_expires.html#expiresactive
+ expiresbytype mod/mod_expires.html#expiresbytype
+ expiresdefault mod/mod_expires.html#expiresdefault
+@@ -337,6 +341,7 @@ maxrequestworkers mod/mpm_common.html#ma
maxspareservers mod/prefork.html#maxspareservers
maxsparethreads mod/mpm_common.html#maxsparethreads
maxthreads mod/mpm_netware.html#maxthreads
@@ -290,7 +314,7 @@ index 10ab0b5..6f1c334 100644
metadir mod/mod_cern_meta.html#metadir
metafiles mod/mod_cern_meta.html#metafiles
metasuffix mod/mod_cern_meta.html#metasuffix
-@@ -521,6 +526,7 @@ sslocspoverrideresponder mod/mod_ssl.html#sslocspoverrideresponder
+@@ -521,6 +526,7 @@ sslocspoverrideresponder mod/mod_ssl.htm
sslocsprespondertimeout mod/mod_ssl.html#sslocsprespondertimeout
sslocspresponsemaxage mod/mod_ssl.html#sslocspresponsemaxage
sslocspresponsetimeskew mod/mod_ssl.html#sslocspresponsetimeskew
@@ -298,10 +322,8 @@ index 10ab0b5..6f1c334 100644
sslopensslconfcmd mod/mod_ssl.html#sslopensslconfcmd
ssloptions mod/mod_ssl.html#ssloptions
sslpassphrasedialog mod/mod_ssl.html#sslpassphrasedialog
-diff --git a/docs/manual/developer/modguide.html.en b/docs/manual/developer/modguide.html.en
-index 391c745..29bc499 100644
---- a/docs/manual/developer/modguide.html.en
-+++ b/docs/manual/developer/modguide.html.en
+--- apache2.orig/docs/manual/developer/modguide.html.en
++++ apache2/docs/manual/developer/modguide.html.en
@@ -201,7 +201,7 @@ definition will look like this:</p>
@@ -311,11 +333,9 @@ index 391c745..29bc499 100644
just want to hook onto the requests and possibly handle some of them. </p>
<p> The reference in our example declaration, <code>register_hooks</code>
-diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
-index 45c4801..00b0b9f 100644
---- a/docs/manual/expr.html.en
-+++ b/docs/manual/expr.html.en
-@@ -197,7 +197,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+--- apache2.orig/docs/manual/expr.html.en
++++ apache2/docs/manual/expr.html.en
+@@ -197,7 +197,7 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>REMOTE_HOST</code></td>
<td>The host name of the remote host</td></tr>
<tr class="odd"><td><code>REMOTE_USER</code></td>
@@ -324,7 +344,7 @@ index 45c4801..00b0b9f 100644
<tr><td><code>REMOTE_IDENT</code></td>
<td>The user name set by <code class="module"><a href="./mod/mod_ident.html">mod_ident</a></code></td></tr>
<tr class="odd"><td><code>SERVER_NAME</code></td>
-@@ -218,7 +218,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+@@ -218,7 +218,7 @@ listfunction ::= listfuncname "<strong>(
<td>The configured <code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code> (e.g.
"<code>basic</code>")</td></tr>
<tr class="odd"><td><code>CONTENT_TYPE</code></td>
@@ -333,7 +353,7 @@ index 45c4801..00b0b9f 100644
<tr><td><code>HANDLER</code></td>
<td>The name of the <a href="handler.html">handler</a> creating
the response</td></tr>
-@@ -229,7 +229,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+@@ -229,7 +229,7 @@ listfunction ::= listfuncname "<strong>(
<td>"<code>on</code>" if the connection uses IPv6,
"<code>off</code>" otherwise</td></tr>
<tr class="odd"><td><code>REQUEST_STATUS</code></td>
@@ -342,11 +362,9 @@ index 45c4801..00b0b9f 100644
<tr><td><code>REQUEST_LOG_ID</code></td>
<td>The error log id of the request (see
<code class="directive"><a href="./mod/core.html#errorlogformat">ErrorLogFormat</a></code>)</td></tr>
-diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr
-index 308f8ef..4c182fa 100644
---- a/docs/manual/expr.html.fr
-+++ b/docs/manual/expr.html.fr
-@@ -203,7 +203,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+--- apache2.orig/docs/manual/expr.html.fr
++++ apache2/docs/manual/expr.html.fr
+@@ -203,7 +203,9 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>REMOTE_HOST</code></td>
<td>Le nom d'h�te de l'h�te distant</td></tr>
<tr class="odd"><td><code>REMOTE_USER</code></td>
@@ -357,7 +375,7 @@ index 308f8ef..4c182fa 100644
<tr><td><code>REMOTE_IDENT</code></td>
<td>Le nom de l'utilisateur d�fini par <code class="module"><a href="./mod/mod_ident.html">mod_ident</a></code></td></tr>
<tr class="odd"><td><code>SERVER_NAME</code></td>
-@@ -222,7 +224,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+@@ -222,7 +224,9 @@ listfunction ::= listfuncname "<strong>(
<td>La valeur de la directive <code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code> (par exemple
"<code>basic</code>")</td></tr>
<tr class="odd"><td><code>CONTENT_TYPE</code></td>
@@ -368,7 +386,7 @@ index 308f8ef..4c182fa 100644
<tr><td><code>HANDLER</code></td>
<td>Le nom du <a href="handler.html">gestionnaire</a> qui a
g�n�r� la r�ponse</td></tr>
-@@ -233,7 +237,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
+@@ -233,7 +237,9 @@ listfunction ::= listfuncname "<strong>(
<td>"<code>on</code>" si la connexion utilise IPv6,
"<code>off</code>" dans le cas contraire</td></tr>
<tr class="odd"><td><code>REQUEST_STATUS</code></td>
@@ -379,10 +397,8 @@ index 308f8ef..4c182fa 100644
<tr><td><code>REQUEST_LOG_ID</code></td>
<td>L'identifiant du message d'erreur associ� � la requ�te (voir
la directive <code class="directive"><a href="./mod/core.html#errorlogformat">ErrorLogFormat</a></code>)</td></tr>
-diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
-index c6563bd..b554c20 100644
---- a/docs/manual/mod/core.html.de
-+++ b/docs/manual/mod/core.html.de
+--- apache2.orig/docs/manual/mod/core.html.de
++++ apache2/docs/manual/mod/core.html.de
@@ -92,6 +92,7 @@ Servers</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
@@ -391,10 +407,11 @@ index c6563bd..b554c20 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -2432,6 +2433,19 @@ resource </td></tr>
+@@ -2431,6 +2432,19 @@ resource </td></tr>
+ </table><p>Die Dokumentation zu dieser Direktive wurde
noch nicht �bersetzt. Bitte schauen Sie in die englische
Version.</p></div>
- <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a>-<a name="mergetrailers" id="mergetrailers">Direktive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Determins whether trailers are merged into headers</td></tr>
@@ -407,14 +424,11 @@ index c6563bd..b554c20 100644
+</table><p>Die Dokumentation zu dieser Direktive wurde
+ noch nicht �bersetzt. Bitte schauen Sie in die englische
+ Version.</p></div>
-+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a>-<a name="mutex" id="mutex">Direktive</a></h2>
<table class="directive">
- <tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Configures mutex mechanism and lock file directory for all
-diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
-index 7d77ade..f798fd3 100644
---- a/docs/manual/mod/core.html.en
-+++ b/docs/manual/mod/core.html.en
+--- apache2.orig/docs/manual/mod/core.html.en
++++ apache2/docs/manual/mod/core.html.en
@@ -89,6 +89,7 @@ available</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
@@ -423,7 +437,17 @@ index 7d77ade..f798fd3 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -3046,6 +3047,25 @@ resource </td></tr>
+@@ -2502,8 +2503,7 @@ from the client</td></tr>
+
+
+ <div class="note">Under normal conditions, the value should not be changed from
+- the default. Also, you can't set this higher than 8190 without
+- modifying the source and rebuilding.</div>
++ the default.</div>
+
+ <div class="warning"><h3>Warning</h3>
+ <p> When name-based virtual hosting is used, the value for this
+@@ -3046,6 +3046,25 @@ resource </td></tr>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -449,10 +473,8 @@ index 7d77ade..f798fd3 100644
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures mutex mechanism and lock file directory for all
-diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es
-index 1780fd4..cb43872 100644
---- a/docs/manual/mod/core.html.es
-+++ b/docs/manual/mod/core.html.es
+--- apache2.orig/docs/manual/mod/core.html.es
++++ apache2/docs/manual/mod/core.html.es
@@ -92,6 +92,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
@@ -461,10 +483,11 @@ index 1780fd4..cb43872 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -2830,6 +2831,19 @@ resource </td></tr>
+@@ -2829,6 +2830,19 @@ resource </td></tr>
+ </table><p>The documentation for this directive has
not been translated yet. Please have a look at the English
version.</p></div>
- <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a> <a name="mergetrailers" id="mergetrailers">Directiva</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Descripci�n:</a></th><td>Determins whether trailers are merged into headers</td></tr>
@@ -477,14 +500,11 @@ index 1780fd4..cb43872 100644
+</table><p>The documentation for this directive has
+ not been translated yet. Please have a look at the English
+ version.</p></div>
-+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Directiva</a></h2>
<table class="directive">
- <tr><th><a href="directive-dict.html#Description">Descripci�n:</a></th><td>Configures mutex mechanism and lock file directory for all
-diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr
-index d796a5f..5be2946 100644
---- a/docs/manual/mod/core.html.fr
-+++ b/docs/manual/mod/core.html.fr
+--- apache2.orig/docs/manual/mod/core.html.fr
++++ apache2/docs/manual/mod/core.html.fr
@@ -89,6 +89,7 @@ disponibles</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
@@ -493,7 +513,20 @@ index d796a5f..5be2946 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -3258,6 +3259,30 @@ Apache</td></tr>
+@@ -2670,10 +2671,8 @@ HTTP</td></tr>
+ <pre class="prettyprint lang-config">LimitRequestLine 4094</pre>
+
+
+- <div class="note">Dans des conditions normales, la valeur par d�faut de cette
+- directive ne doit pas �tre modifi�e. En outre, vous ne
+- pouvez pas sp�cifier une valeur sup�rieure � 8190 sans modifier le
+- code source et recompiler.</div>
++ <div class="note">Dans des conditions normales, cette directive doit conserver
++ sa valeur par d�faut.</div>
+
+ <div class="warning"><h3>Avertissement</h3>
+ <p>Dans le cas des serveurs virtuels � base de noms, la valeur de
+@@ -3258,6 +3257,30 @@ Apache</td></tr>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -524,10 +557,8 @@ index d796a5f..5be2946 100644
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit les m�canismes de mutex et le repertoire du fichier
-diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8
-index 8a30eab..bbd0ece 100644
---- a/docs/manual/mod/core.html.ja.utf8
-+++ b/docs/manual/mod/core.html.ja.utf8
+--- apache2.orig/docs/manual/mod/core.html.ja.utf8
++++ apache2/docs/manual/mod/core.html.ja.utf8
@@ -92,6 +92,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>
@@ -536,10 +567,11 @@ index 8a30eab..bbd0ece 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -2373,6 +2374,19 @@ resource </td></tr>
+@@ -2372,6 +2373,19 @@ resource </td></tr>
+ </table><p>このディレクティブの解説文書は
まだ翻訳されていません。英語版をご覧ください。
</p></div>
- <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a> <a name="mergetrailers" id="mergetrailers">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Determins whether trailers are merged into headers</td></tr>
@@ -552,14 +584,11 @@ index 8a30eab..bbd0ece 100644
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </p></div>
-+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">ディレクティブ</a></h2>
<table class="directive">
- <tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Configures mutex mechanism and lock file directory for all
-diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8
-index a9e4ab1..68a7e09 100644
---- a/docs/manual/mod/core.html.tr.utf8
-+++ b/docs/manual/mod/core.html.tr.utf8
+--- apache2.orig/docs/manual/mod/core.html.tr.utf8
++++ apache2/docs/manual/mod/core.html.tr.utf8
@@ -31,6 +31,7 @@
<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../tr/mod/core.html" title="Türkçe"> tr </a></p>
@@ -576,29 +605,43 @@ index a9e4ab1..68a7e09 100644
<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-@@ -3061,6 +3063,18 @@ LogLevel info ssl_module:warn</pre>
+@@ -3061,6 +3063,25 @@ LogLevel info ssl_module:warn</pre>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a> <a name="mergetrailers" id="mergetrailers">Yönergesi</a></h2>
+<table class="directive">
-+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Determins whether trailers are merged into headers</td></tr>
++<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Trailer alanlarının başlığa dahil edilip edilmeyeceğini belirler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MergeTrailers [on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MergeTrailers off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
-+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.4.10 and later</td></tr>
-+</table><p>Bu yönergenin belgesi henüz Türkçeye çevrilmedi.
-+ Lütfen İngilizce sürümüne bakınız.</p></div>
++<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.4.10 ve sonrası</td></tr>
++</table>
++ <p>Bu yönerge HTTP Trailer alanlarının dahili HTTP başlıklarına kopyalanıp
++ kopyalanmayacağını belirler. Kopyalama işlemi istek gövdesi tamamen
++ alındığında gerçekleşir, çoğu başlık işleminin çok sonra istek
++ başlıklarını inceleme veya değiştirme şansı olur.</p>
++ <p>Bu seçenek, Trailer alanlarını daima kopyalayan 2.4.10 öncesi
++ dağıtımlarla uyumluluk için vardır.</p>
++
++</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Mutex" id="Mutex">Mutex</a> <a name="mutex" id="mutex">Yönergesi</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Muteks mekanizmasını ve kilit dosyası dizinini tüm muteksler veya belirtilenler için yapılandırır</td></tr>
-diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
-index de1f7dd..017e229 100644
---- a/docs/manual/mod/directives.html.de
-+++ b/docs/manual/mod/directives.html.de
+--- apache2.orig/docs/manual/mod/directives.html.de
++++ apache2/docs/manual/mod/directives.html.de
+@@ -257,7 +257,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -381,6 +381,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -607,10 +650,17 @@ index de1f7dd..017e229 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
-index 2ba02bd..3392d37 100644
---- a/docs/manual/mod/directives.html.en
-+++ b/docs/manual/mod/directives.html.en
+--- apache2.orig/docs/manual/mod/directives.html.en
++++ apache2/docs/manual/mod/directives.html.en
+@@ -258,7 +258,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -382,6 +382,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -619,10 +669,17 @@ index 2ba02bd..3392d37 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
-index 6cfd408..4761091 100644
---- a/docs/manual/mod/directives.html.es
-+++ b/docs/manual/mod/directives.html.es
+--- apache2.orig/docs/manual/mod/directives.html.es
++++ apache2/docs/manual/mod/directives.html.es
+@@ -260,7 +260,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -384,6 +384,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -631,10 +688,17 @@ index 6cfd408..4761091 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.fr b/docs/manual/mod/directives.html.fr
-index d65155c..521722b 100644
---- a/docs/manual/mod/directives.html.fr
-+++ b/docs/manual/mod/directives.html.fr
+--- apache2.orig/docs/manual/mod/directives.html.fr
++++ apache2/docs/manual/mod/directives.html.fr
+@@ -258,7 +258,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -382,6 +382,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -643,10 +707,17 @@ index d65155c..521722b 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8
-index e86e7f1..3833d3d 100644
---- a/docs/manual/mod/directives.html.ja.utf8
-+++ b/docs/manual/mod/directives.html.ja.utf8
+--- apache2.orig/docs/manual/mod/directives.html.ja.utf8
++++ apache2/docs/manual/mod/directives.html.ja.utf8
+@@ -255,7 +255,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -379,6 +379,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -655,10 +726,17 @@ index e86e7f1..3833d3d 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
-index a06e92a..135279c 100644
---- a/docs/manual/mod/directives.html.ko.euc-kr
-+++ b/docs/manual/mod/directives.html.ko.euc-kr
+--- apache2.orig/docs/manual/mod/directives.html.ko.euc-kr
++++ apache2/docs/manual/mod/directives.html.ko.euc-kr
+@@ -255,7 +255,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -379,6 +379,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -667,10 +745,17 @@ index a06e92a..135279c 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8
-index 59c0886..59a9379 100644
---- a/docs/manual/mod/directives.html.tr.utf8
-+++ b/docs/manual/mod/directives.html.tr.utf8
+--- apache2.orig/docs/manual/mod/directives.html.tr.utf8
++++ apache2/docs/manual/mod/directives.html.tr.utf8
+@@ -254,7 +254,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -378,6 +378,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -679,10 +764,17 @@ index 59c0886..59a9379 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8
-index ac7f82c..39d1391 100644
---- a/docs/manual/mod/directives.html.zh-cn.utf8
-+++ b/docs/manual/mod/directives.html.zh-cn.utf8
+--- apache2.orig/docs/manual/mod/directives.html.zh-cn.utf8
++++ apache2/docs/manual/mod/directives.html.zh-cn.utf8
+@@ -253,7 +253,7 @@
+ <li><a href="core.html#errordocument">ErrorDocument</a></li>
+ <li><a href="core.html#errorlog">ErrorLog</a></li>
+ <li><a href="core.html#errorlogformat">ErrorLogFormat</a></li>
+-<li><a href="mod_example.html#example">Example</a></li>
++<li><a href="mod_example_hooks.html#example">Example</a></li>
+ <li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+ <li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+ <li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
@@ -377,6 +377,7 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
@@ -691,10 +783,8 @@ index ac7f82c..39d1391 100644
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en
-index 53fad49..6748795 100644
---- a/docs/manual/mod/mod_authn_core.html.en
-+++ b/docs/manual/mod/mod_authn_core.html.en
+--- apache2.orig/docs/manual/mod/mod_authn_core.html.en
++++ apache2/docs/manual/mod/mod_authn_core.html.en
@@ -176,6 +176,8 @@ the specified alias</td></tr>
AuthBasicProvider</a></code> or <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">
AuthDigestProvider</a></code>.</p>
@@ -704,11 +794,9 @@ index 53fad49..6748795 100644
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-diff --git a/docs/manual/mod/mod_authn_core.html.fr b/docs/manual/mod/mod_authn_core.html.fr
-index b1da4bd..ceab518 100644
---- a/docs/manual/mod/mod_authn_core.html.fr
-+++ b/docs/manual/mod/mod_authn_core.html.fr
-@@ -182,6 +182,10 @@ l'alias sp
+--- apache2.orig/docs/manual/mod/mod_authn_core.html.fr
++++ apache2/docs/manual/mod/mod_authn_core.html.fr
+@@ -182,6 +182,10 @@ l'alias sp�cifi�</td></tr>
ensemble de directives d'authentification qui seront r�f�renc�es par
l'alias sp�cifi� � l'aide des directives <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ou <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>.</p>
@@ -719,10 +807,8 @@ index b1da4bd..ceab518 100644
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-diff --git a/docs/manual/mod/mod_authnz_fcgi.html.en b/docs/manual/mod/mod_authnz_fcgi.html.en
-index 3c9c32c..0328327 100644
---- a/docs/manual/mod/mod_authnz_fcgi.html.en
-+++ b/docs/manual/mod/mod_authnz_fcgi.html.en
+--- apache2.orig/docs/manual/mod/mod_authnz_fcgi.html.en
++++ apache2/docs/manual/mod/mod_authnz_fcgi.html.en
@@ -30,7 +30,8 @@
httpd authentication and authorization</td></tr>
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -733,7 +819,7 @@ index 3c9c32c..0328327 100644
<h3>Summary</h3>
<p>This module allows FastCGI authorizer applications to
-@@ -508,7 +509,7 @@ authentication and/or authorization</td></tr>
+@@ -508,7 +509,7 @@ authentication and/or authorization</td>
<dl>
<dt><em>type</em></dt>
<dd>This must be set to <em>authn</em> for authentication,
@@ -742,10 +828,8 @@ index 3c9c32c..0328327 100644
a generic FastCGI authorizer which performs both checks.</dd>
<dt><em>provider-name</em></dt>
-diff --git a/docs/manual/mod/mod_cgid.html.fr b/docs/manual/mod/mod_cgid.html.fr
-index cfccf41..3159eae 100644
---- a/docs/manual/mod/mod_cgid.html.fr
-+++ b/docs/manual/mod/mod_cgid.html.fr
+--- apache2.orig/docs/manual/mod/mod_cgid.html.fr
++++ apache2/docs/manual/mod/mod_cgid.html.fr
@@ -29,8 +29,6 @@
<a href="../ja/mod/mod_cgid.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
@@ -755,7 +839,7 @@ index cfccf41..3159eae 100644
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Ex�cution des scripts CGI par l'interm�diaire d'un d�mon
CGI externe</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Base</td></tr>
-@@ -84,19 +82,26 @@ utilisateurs diff
+@@ -84,19 +82,26 @@ utilisateurs diff�rents</a></li>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CGIDScriptTimeout" id="CGIDScriptTimeout">CGIDScriptTimeout</a> <a name="cgidscripttimeout" id="cgidscripttimeout">Directive</a></h2>
<table class="directive">
@@ -790,10 +874,8 @@ index cfccf41..3159eae 100644
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">Directive</a></h2>
<table class="directive">
-diff --git a/docs/manual/mod/mod_deflate.html.fr b/docs/manual/mod/mod_deflate.html.fr
-index 9ce98da..7f4ed73 100644
---- a/docs/manual/mod/mod_deflate.html.fr
-+++ b/docs/manual/mod/mod_deflate.html.fr
+--- apache2.orig/docs/manual/mod/mod_deflate.html.fr
++++ apache2/docs/manual/mod/mod_deflate.html.fr
@@ -29,8 +29,6 @@
<a href="../ja/mod/mod_deflate.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
@@ -884,10 +966,8 @@ index 9ce98da..7f4ed73 100644
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">Directive</a></h2>
<table class="directive">
-diff --git a/docs/manual/mod/mod_ldap.html.fr b/docs/manual/mod/mod_ldap.html.fr
-index 0b9b727..cfe25d8 100644
---- a/docs/manual/mod/mod_ldap.html.fr
-+++ b/docs/manual/mod/mod_ldap.html.fr
+--- apache2.orig/docs/manual/mod/mod_ldap.html.fr
++++ apache2/docs/manual/mod/mod_ldap.html.fr
@@ -27,8 +27,6 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ldap.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/mod/mod_ldap.html" title="Fran�ais"> fr </a></p>
@@ -922,10 +1002,8 @@ index 0b9b727..cfe25d8 100644
<div class="note"><p>Cette dur�e de vie s'exprime par d�faut en secondes, mais
il est possible d'utiliser d'autres unit�s en ajoutant un suffixe :
-diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
-index 0be3910..388eb03 100644
---- a/docs/manual/mod/mod_log_config.html.en
-+++ b/docs/manual/mod/mod_log_config.html.en
+--- apache2.orig/docs/manual/mod/mod_log_config.html.en
++++ apache2/docs/manual/mod/mod_log_config.html.en
@@ -234,6 +234,12 @@
<td>Bytes transferred (received and sent), including request and headers,
cannot be zero. This is the combination of %I and %O. You need to
@@ -939,10 +1017,8 @@ index 0be3910..388eb03 100644
</table>
<h3><a name="modifiers" id="modifiers">Modifiers</a></h3>
-diff --git a/docs/manual/mod/mod_log_config.html.fr b/docs/manual/mod/mod_log_config.html.fr
-index d084843..3df70c1 100644
---- a/docs/manual/mod/mod_log_config.html.fr
-+++ b/docs/manual/mod/mod_log_config.html.fr
+--- apache2.orig/docs/manual/mod/mod_log_config.html.fr
++++ apache2/docs/manual/mod/mod_log_config.html.fr
@@ -261,6 +261,12 @@ d'Apache</a></li>
nul, et il correspond � la combinaison des formats %I et %O.
<code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> doit �tre charg� pour pouvoir
@@ -956,23 +1032,24 @@ index d084843..3df70c1 100644
</table>
<h3><a name="modifiers" id="modifiers">Modificateurs</a></h3>
-diff --git a/docs/manual/mod/mod_log_config.html.tr.utf8 b/docs/manual/mod/mod_log_config.html.tr.utf8
-index 0e16911..da2ad7b 100644
---- a/docs/manual/mod/mod_log_config.html.tr.utf8
-+++ b/docs/manual/mod/mod_log_config.html.tr.utf8
-@@ -30,6 +30,7 @@
- <a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
- <a href="../tr/mod/mod_log_config.html" title="Türkçe"> tr </a></p>
- </div>
-+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
- <table class="module"><tr><th><a href="module-dict.html#Description">Açıklama:</a></th><td>Sunucuya yapılan isteklerin günlük kayıtlarının tutulması
- </td></tr>
- <tr><th><a href="module-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
-diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
-index 097a1a8..33a324d 100644
---- a/docs/manual/mod/mod_rewrite.html.fr
-+++ b/docs/manual/mod/mod_rewrite.html.fr
-@@ -119,7 +119,7 @@ r
+--- apache2.orig/docs/manual/mod/mod_log_config.html.tr.utf8
++++ apache2/docs/manual/mod/mod_log_config.html.tr.utf8
+@@ -231,6 +231,12 @@
+ <td>Aktarılan bayt sayısı (alınan ve gönderilen), istekler ve başlıklar
+ dahil; sıfır olamaz. %I ve %O'nun birleşimidir. Bunu kullanmak için
+ <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> etkinleştirilmelidir.</td></tr>
++<tr class="odd"><td><code>%{<var>ALANADI</var>}^ti</code></td>
++ <td>Sunucuya gönderilen istekteki <code><var>ALANADI</var>:</code>
++ Trailer satır(lar)ının içeriği.</td></tr>
++<tr><td><code>%{<var>VARNAME</var>}^to</code></td>
++ <td>Sunucudan gönderilen yanıttaki <code><var>ALANADI</var>:</code>
++ Trailer satır(lar)ının içeriği.</td></tr>
+ </table>
+
+ <h3><a name="modifiers" id="modifiers">Değiştiriciler</a></h3>
+--- apache2.orig/docs/manual/mod/mod_rewrite.html.fr
++++ apache2/docs/manual/mod/mod_rewrite.html.fr
+@@ -119,7 +119,7 @@ r�gles permettant de r��crire les URLs d
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit l'URL de base pour les r��critures au niveau
r�pertoire</td></tr>
@@ -990,7 +1067,7 @@ index 097a1a8..33a324d 100644
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</td></tr>
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-@@ -390,8 +390,8 @@ la r
+@@ -390,8 +390,8 @@ la r��criture soit effectu�e
</li>
</ul>
@@ -1001,7 +1078,7 @@ index 097a1a8..33a324d 100644
en tant qu'expression rationnelle de type <a href="../expr.html">ap_expr</a>. Si des en-t�tes HTTP sont
r�f�renc�s dans l'expression rationnelle, et si le drapeau
<code>novary</code> n'est pas activ�, ils seront ajout�s �
-@@ -490,23 +490,22 @@ la r
+@@ -490,23 +490,22 @@ la r��criture soit effectu�e
</ol>
@@ -1031,7 +1108,7 @@ index 097a1a8..33a324d 100644
<li>Vous pouvez effectuer des comparaisons lexicographiques de
cha�nes :
-@@ -516,45 +515,45 @@ la r
+@@ -516,45 +515,45 @@ la r��criture soit effectu�e
lexicographique)<br />
Traite l'<em>expression</em> comme une cha�ne de
caract�res et la compare lexicographiquement �
@@ -1094,7 +1171,7 @@ index 097a1a8..33a324d 100644
sont identiques, caract�re pour caract�re).</li>
</ul></li>
-@@ -563,43 +562,38 @@ la r
+@@ -563,43 +562,38 @@ la r��criture soit effectu�e
<ul>
<li>'<strong>-eq</strong>' (est num�riquement �gal �)<br />
@@ -1152,7 +1229,7 @@ index 097a1a8..33a324d 100644
Attention � la confusion avec le drapeau <strong>-l</strong>
en utilisant la variante the <strong>-L</strong> ou
<strong>-h</strong>.</li>
-@@ -613,17 +607,17 @@ la r
+@@ -613,17 +607,17 @@ la r��criture soit effectu�e
<li>'<strong>-d</strong>' (est un r�pertoire -
<strong>d</strong>irectory)<br />
@@ -1173,7 +1250,7 @@ index 097a1a8..33a324d 100644
accessible � travers tous les contr�les d'acc�s du serveur
actuellement configur�s pour ce chemin. C'est une
sous-requ�te interne qui effectue cette v�rification - �
-@@ -635,7 +629,7 @@ la r
+@@ -635,7 +629,7 @@ la r��criture soit effectu�e
Voir <strong>-l</strong>.</li>
<li>'<strong>-l</strong>' (est un lien symbolique)<br />
@@ -1182,7 +1259,7 @@ index 097a1a8..33a324d 100644
v�rifie son existence et si elle est un lien symbolique. On
peut aussi utiliser la convention bash <strong>-L</strong>
ou <strong>-h</strong> lorsqu'il y a risque de confusion
-@@ -647,13 +641,13 @@ la r
+@@ -647,13 +641,13 @@ la r��criture soit effectu�e
<li>'<strong>-s</strong>' (est un fichier r�gulier d'une
certaine taille)<br />
@@ -1198,7 +1275,7 @@ index 097a1a8..33a324d 100644
accessible � travers tous les contr�les d'acc�s du serveur
actuellement configur�s pour ce chemin. C'est une
sous-requ�te interne qui effectue cette v�rification - �
-@@ -667,7 +661,7 @@ la r
+@@ -667,7 +661,7 @@ la r��criture soit effectu�e
retourn�.</p></li>
<li>'<strong>-x</strong>' (a l'attribut d'ex�cution positionn�)<br />
@@ -1207,7 +1284,7 @@ index 097a1a8..33a324d 100644
v�rifie son existence et si elle a son attribut d'ex�cution
positionn�. Ce positionnement est d�termin� en fonction de
l'OS sous-jacent.</li>
-@@ -677,8 +671,8 @@ la r
+@@ -677,8 +671,8 @@ la r��criture soit effectu�e
</li>
<li>
@@ -1218,7 +1295,7 @@ index 097a1a8..33a324d 100644
trait�e en tant qu'expression rationnelle de type <a href="../expr.html">ap_expr</a>.</p>
<p>
-@@ -694,7 +688,7 @@ la r
+@@ -694,7 +688,7 @@ la r��criture soit effectu�e
</li>
<li>Vous pouvez aussi d�finir certains drapeaux pour
@@ -1227,7 +1304,7 @@ index 097a1a8..33a324d 100644
<strong><code>[</code><em>drapeaux</em><code>]</code></strong>
comme troisi�me argument de la directive
<code>RewriteCond</code>, o� <em>drapeaux</em> est un
-@@ -705,10 +699,10 @@ la r
+@@ -705,10 +699,10 @@ la r��criture soit effectu�e
(<strong>n</strong>o <strong>c</strong>ase)<br />
Rend le test insensible � la casse - il n'est pas fait de
distinction entre majuscules et minuscules, � la fois dans le
@@ -1242,7 +1319,7 @@ index 097a1a8..33a324d 100644
v�rification par sous-requ�tes ou sur le syst�me de
fichiers.</li>
-@@ -805,8 +799,7 @@ moteur de r
+@@ -805,8 +799,7 @@ moteur de r��criture</td></tr>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit une fonction de mise en correspondance pour la
recherche de mots-cl�s</td></tr>
@@ -1252,7 +1329,7 @@ index 097a1a8..33a324d 100644
</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
-@@ -820,24 +813,22 @@ correspondance</em>:<em>source de la correspondance</em>
+@@ -820,24 +813,22 @@ correspondance</em>:<em>source de la cor
La source utilis�e pour cette recherche peut �tre de plusieurs
types.</p>
@@ -1282,7 +1359,7 @@ index 097a1a8..33a324d 100644
et la cl� <em>mot-cl�</em> recherch�e. Si la cl� est trouv�e, la
construction est remplac�e par
la <em>valeur de remplacement</em>. Si la cl� n'est pas trouv�e,
-@@ -883,12 +874,12 @@ correspondance</em>:<em>source de la correspondance</em>
+@@ -883,12 +874,12 @@ correspondance</em>:<em>source de la cor
<dt>prg</dt>
<dd>Appelle un programme externe ou un script pour effectuer la
@@ -1297,10 +1374,19 @@ index 097a1a8..33a324d 100644
...</a>).</dd>
</dl>
-diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
-index 517b0b4..aaded6c 100644
---- a/docs/manual/mod/mod_ssl.html.en
-+++ b/docs/manual/mod/mod_ssl.html.en
+--- apache2.orig/docs/manual/mod/mod_ssl.html.en
++++ apache2/docs/manual/mod/mod_ssl.html.en
+@@ -1073,8 +1073,8 @@ which means that OCSP responses are cons
+ </table>
+ <p>This option determines whether queries to OCSP responders should contain
+ a nonce or not. By default, a query nonce is always used and checked against
+-the response's one. When the responder does not use nonces (eg. Microsoft OCSP
+-Responder), this option ought to be turned <code>off</code>.</p>
++the response's one. When the responder does not use nonces (e.g. Microsoft OCSP
++Responder), this option should be turned <code>off</code>.</p>
+
+ </div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2121,6 +2121,7 @@ in the Session Cache</td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -1309,10 +1395,28 @@ index 517b0b4..aaded6c 100644
</table>
<p>
This directive sets the timeout in seconds for the information stored in the
-diff --git a/docs/manual/mod/mod_ssl.html.fr b/docs/manual/mod/mod_ssl.html.fr
-index 344ecce..e009591 100644
---- a/docs/manual/mod/mod_ssl.html.fr
-+++ b/docs/manual/mod/mod_ssl.html.fr
+@@ -2236,6 +2237,10 @@ With the exception of <code>none</code>
+ the same storage types are supported as with
+ <code class="directive"><a href="#sslsessioncache">SSLSessionCache</a></code>.</p>
+
++<p>The <code>ssl-stapling</code> mutex is used to serialize access to the
++OCSP stapling cache to prevent corruption. This mutex can be configured
++using the <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code> directive.</p>
++
+ </div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+ <div class="directive-section"><h2><a name="SSLStaplingErrorCacheTimeout" id="SSLStaplingErrorCacheTimeout">SSLStaplingErrorCacheTimeout</a> <a name="sslstaplingerrorcachetimeout" id="sslstaplingerrorcachetimeout">Directive</a></h2>
+@@ -2283,7 +2288,7 @@ is also enabled.</p>
+ </table>
+ <p>This directive overrides the URI of an OCSP responder as obtained from
+ the authorityInfoAccess (AIA) extension of the certificate.
+-Of potential use when going through a proxy for retrieving OCSP queries.</p>
++One potential use is when a proxy is used for retrieving OCSP queries.</p>
+
+ </div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+--- apache2.orig/docs/manual/mod/mod_ssl.html.fr
++++ apache2/docs/manual/mod/mod_ssl.html.fr
@@ -27,8 +27,6 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ssl.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/mod/mod_ssl.html" title="Fran�ais"> fr </a></p>
@@ -1338,10 +1442,28 @@ index 344ecce..e009591 100644
�tre d�finie � une valeur d'environ 15 � des fins de test, mais � une
valeur tr�s sup�rieure comme 300 en production.</p>
<div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">SSLSessionCacheTimeout 600</pre>
-diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
-index 0fd8366..6668396 100644
---- a/docs/manual/mod/quickreference.html.de
-+++ b/docs/manual/mod/quickreference.html.de
+@@ -2488,6 +2489,10 @@ l'exception de <code>none</code> et <cod
+ directive supporte les m�mes types de stockage que la directive
+ <code class="directive"><a href="#sslsessioncache">SSLSessionCache</a></code>.</p>
+
++<p>Le mutex <code>ssl-stapling</code> permet de s�rialiser l'acc�s au
++cache d'agrafage OCSP afin d'en pr�venir la corruption. Ce mutex peut
++�tre configur� via la directive <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code>.</p>
++
+ </div>
+ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+ <div class="directive-section"><h2><a name="SSLStaplingErrorCacheTimeout" id="SSLStaplingErrorCacheTimeout">SSLStaplingErrorCacheTimeout</a> <a name="sslstaplingerrorcachetimeout" id="sslstaplingerrorcachetimeout">Directive</a></h2>
+--- apache2.orig/docs/manual/mod/quickreference.html.de
++++ apache2/docs/manual/mod/quickreference.html.de
+@@ -431,7 +431,7 @@ Dateien an den Client auszuliefern</td><
+ zur�ckgibt</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>Dateiname</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Ablageort, an dem der Server Fehler protokolliert</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+ headers</td></tr>
@@ -641,439 +641,440 @@ simultaneously</td></tr>
Servers</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximale Anzahl unbesch�ftigter Threads</td></tr>
@@ -2084,10 +2206,17 @@ index 0fd8366..6668396 100644
</table></div>
<div class="bottomlang">
<p><span>Verf�gbare Sprachen: </span><a href="../de/mod/quickreference.html" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
-index fd436ba..e870559 100644
---- a/docs/manual/mod/quickreference.html.en
-+++ b/docs/manual/mod/quickreference.html.en
+--- apache2.orig/docs/manual/mod/quickreference.html.en
++++ apache2/docs/manual/mod/quickreference.html.en
+@@ -426,7 +426,7 @@ after a crash</td></tr>
+ in case of an error</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+ headers</td></tr>
@@ -634,431 +634,432 @@ simultaneously</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
@@ -2821,10 +2950,17 @@ index fd436ba..e870559 100644
</table></div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
-index 0c962a5..bcd629a 100644
---- a/docs/manual/mod/quickreference.html.es
-+++ b/docs/manual/mod/quickreference.html.es
+--- apache2.orig/docs/manual/mod/quickreference.html.es
++++ apache2/docs/manual/mod/quickreference.html.es
+@@ -433,7 +433,7 @@ after a crash</td></tr>
+ in case of an error</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLog [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+ headers</td></tr>
@@ -641,432 +641,433 @@ simultaneously</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
@@ -3559,11 +3695,9 @@ index 0c962a5..bcd629a 100644
</table></div>
<div class="bottomlang">
<p><span>Idiomas disponibles: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.fr b/docs/manual/mod/quickreference.html.fr
-index 09e43e1..ff1f0e1 100644
---- a/docs/manual/mod/quickreference.html.fr
-+++ b/docs/manual/mod/quickreference.html.fr
-@@ -407,8 +407,8 @@ consid
+--- apache2.orig/docs/manual/mod/quickreference.html.fr
++++ apache2/docs/manual/mod/quickreference.html.fr
+@@ -407,8 +407,8 @@ consid�re comme arriv�es � expiration</t
l'ent�te Cache-Control: a pour valeur no-store.</td></tr>
<tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Tente de mettre en cache des r�ponses que le serveur a
marqu�es comme priv�es</td></tr>
@@ -3589,7 +3723,16 @@ index 09e43e1..ff1f0e1 100644
<tr class="odd"><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>valeur</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">La quantit� de m�moire utilisable par zlib pour la
compression</td></tr>
<tr><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>valeur</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Taille de la fen�tre de compression zlib</td></tr>
-@@ -801,555 +801,556 @@ simultan
+@@ -532,7 +532,7 @@ d'erreur personnalis�</td></tr>
+ d'erreur</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>chemin fichier</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">D�finition du chemin du journal des erreurs</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Sp�cification du format des entr�es du journal des erreurs</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Directive de d�monstration pour illustrer l'API des modules
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Directive de d�monstration pour illustrer l'API des modules
+ Apache</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Active la g�n�ration d'en-t�tes
+ <code>Expires</code></td></tr>
+@@ -801,555 +801,556 @@ simultan�ment</td></tr>
inactifs</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>nombre</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Nombre maximum de threads inactifs</td></tr>
<tr><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>nombre</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">D�finit le nombre maximum de threads esclaves</td></tr>
@@ -4452,10 +4595,17 @@ index 09e43e1..ff1f0e1 100644
commencer son traitement.</td></tr>
</table></div>
<div class="bottomlang">
-diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
-index 8268dce..8de988b 100644
---- a/docs/manual/mod/quickreference.html.ja.utf8
-+++ b/docs/manual/mod/quickreference.html.ja.utf8
+--- apache2.orig/docs/manual/mod/quickreference.html.ja.utf8
++++ apache2/docs/manual/mod/quickreference.html.ja.utf8
+@@ -406,7 +406,7 @@ satisfied</td></tr>
+ <tr><td><a href="core.html#errordocument">ErrorDocument <var>error-code document</var></a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">エラーが発生したときにサーバがクライアントに送るもの</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">サーバがエラーをログ収集する場所</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4"><code>Expires</code> ヘッダの生成を有効にする</td></tr>
+ <tr class="odd"><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
@@ -600,395 +600,396 @@ simultaneously</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">アイドルな子サーバプロセスの最大個数</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">アイドルスレッドの最大数</td></tr>
@@ -4724,10 +4874,7 @@ index 8268dce..8de988b 100644
-<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
- <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
-+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-+ <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
- </td></tr>
+-</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
@@ -4735,6 +4882,10 @@ index 8268dce..8de988b 100644
-<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
- <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Apache の子プロセスから起動されたプロセスの CPU 消費量を
++<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
++<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
++ <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
++</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
@@ -5146,10 +5297,17 @@ index 8268dce..8de988b 100644
</table></div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
-index e43aefc..bf126d6 100644
---- a/docs/manual/mod/quickreference.html.ko.euc-kr
-+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
+--- apache2.orig/docs/manual/mod/quickreference.html.ko.euc-kr
++++ apache2/docs/manual/mod/quickreference.html.ko.euc-kr
+@@ -405,7 +405,7 @@ after a crash</td></tr>
+ in case of an error</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4"><code>Expires</code> ����� �����Ѵ�</td></tr>
+ <tr class="odd"><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
+ <var><code>seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">MIME type���� <code>Expires</code> ������� �����Ѵ�</td></tr>
@@ -603,420 +603,421 @@ simultaneously</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
@@ -5870,16 +6028,23 @@ index e43aefc..bf126d6 100644
</table></div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
-index aded004..062a888 100644
---- a/docs/manual/mod/quickreference.html.tr.utf8
-+++ b/docs/manual/mod/quickreference.html.tr.utf8
+--- apache2.orig/docs/manual/mod/quickreference.html.tr.utf8
++++ apache2/docs/manual/mod/quickreference.html.tr.utf8
+@@ -426,7 +426,7 @@ server</td></tr>
+ belirler.</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>dosya-yolu</var>|syslog[:<var>oluşum</var>]</a></td><td> logs/error_log (Uni +</td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun hata günlüğünü tutacağı yeri belirler.</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>biçem</var></a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Hata günlüğü girdileri için biçem belirtimi</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>skdh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>skdh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+ headers</td></tr>
@@ -636,432 +636,433 @@ processing</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>sayı</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Boştaki çocuk süreçlerin azami sayısı</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Boştaki azami evre sayısını belirler</td></tr>
<tr><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Set the maximum number of worker threads</td></tr>
-<tr class="odd"><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
-+<tr class="odd"><td><a href="core.html#mergetrailers">MergeTrailers [on|off]</a></td><td> off </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Determins whether trailers are merged into headers</td></tr>
++<tr class="odd"><td><a href="core.html#mergetrailers">MergeTrailers [on|off]</a></td><td> off </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Trailer alanlarının başlığa dahil edilip edilmeyeceğini belirler</td></tr>
+<tr><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
files</td></tr>
-<tr><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
@@ -6166,10 +6331,7 @@ index aded004..062a888 100644
-<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
- <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
-+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-+ <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
- </td></tr>
+-</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
@@ -6177,6 +6339,10 @@ index aded004..062a888 100644
-<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
- <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>saniye</var>|max [<var>saniye</var>|max]</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Apache httpd alt süreçleri tarafından çalıştırılan süreçlerin
++<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
++<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
++ <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
++</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
@@ -6246,16 +6412,9 @@ index aded004..062a888 100644
-<tr><td><a href="core.html#serverpath">ServerPath <var>URL-yolu</var></a></td><td></td><td>k</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Uyumsuz bir tarayıcı tarafından erişilmesi için bir isme dayalı sanal konak için meşru URL yolu</td></tr>
-<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>dizin-yolu</var></a></td><td> /usr/local/apache </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucu yapılandırması için kök dizin</td></tr>
-<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucu tarafından üretilen belgelerin dipnotunu ayarlar.
-+<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Ayarlanabilir süreç sayısının üst sınırını belirler.</td></tr>
-+<tr><td><a href="core.html#servername">ServerName [<var>şema</var>://]<var>tam-nitelenmiş-alan-adı</var>[:<var>port</var>]
-+</a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucunun özdeşleşeceği konak ismi ve port.</td></tr>
-+<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-yolu</var></a></td><td></td><td>k</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Uyumsuz bir tarayıcı tarafından erişilmesi için bir isme dayalı sanal konak için meşru URL yolu</td></tr>
-+<tr><td><a href="core.html#serverroot">ServerRoot <var>dizin-yolu</var></a></td><td> /usr/local/apache </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucu yapılandırması için kök dizin</td></tr>
-+<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucu tarafından üretilen belgelerin dipnotunu ayarlar.
- </td></tr>
+-</td></tr>
-<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4"><code>Server</code> HTTP yanıt başlığını yapılandırır.
-+<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4"><code>Server</code> HTTP yanıt başlığını yapılandırır.
- </td></tr>
+-</td></tr>
-<tr><td><a href="mod_session.html#session">Session On|Off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables a session for the current directory or location</td></tr>
-<tr class="odd"><td><a href="mod_session_cookie.html#sessioncookiename">SessionCookieName <var>name</var> <var>attributes</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name and attributes for the RFC2109 cookie storing the session</td></tr>
-<tr><td><a href="mod_session_cookie.html#sessioncookiename2">SessionCookieName2 <var>name</var> <var>attributes</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name and attributes for the RFC2965 cookie storing the session</td></tr>
@@ -6273,6 +6432,15 @@ index aded004..062a888 100644
-<tr><td><a href="mod_session_dbd.html#sessiondbdselectlabel">SessionDBDSelectLabel <var>label</var></a></td><td> selectsession </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The SQL query to use to select sessions from the database</td></tr>
-<tr class="odd"><td><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel <var>label</var></a></td><td> updatesession </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The SQL query to use to update existing sessions in the database</td></tr>
-<tr><td><a href="mod_session.html#sessionenv">SessionEnv On|Off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Control whether the contents of the session are written to the
++<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Ayarlanabilir süreç sayısının üst sınırını belirler.</td></tr>
++<tr><td><a href="core.html#servername">ServerName [<var>şema</var>://]<var>tam-nitelenmiş-alan-adı</var>[:<var>port</var>]
++</a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucunun özdeşleşeceği konak ismi ve port.</td></tr>
++<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-yolu</var></a></td><td></td><td>k</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Uyumsuz bir tarayıcı tarafından erişilmesi için bir isme dayalı sanal konak için meşru URL yolu</td></tr>
++<tr><td><a href="core.html#serverroot">ServerRoot <var>dizin-yolu</var></a></td><td> /usr/local/apache </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucu yapılandırması için kök dizin</td></tr>
++<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucu tarafından üretilen belgelerin dipnotunu ayarlar.
++</td></tr>
++<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4"><code>Server</code> HTTP yanıt başlığını yapılandırır.
++</td></tr>
+<tr class="odd"><td><a href="mod_session.html#session">Session On|Off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables a session for the current directory or location</td></tr>
+<tr><td><a href="mod_session_cookie.html#sessioncookiename">SessionCookieName <var>name</var> <var>attributes</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name and attributes for the RFC2109 cookie storing the session</td></tr>
+<tr class="odd"><td><a href="mod_session_cookie.html#sessioncookiename2">SessionCookieName2 <var>name</var> <var>attributes</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name and attributes for the RFC2965 cookie storing the session</td></tr>
@@ -6610,10 +6778,17 @@ index aded004..062a888 100644
</table></div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8
-index 02b9015..617cb1d 100644
---- a/docs/manual/mod/quickreference.html.zh-cn.utf8
-+++ b/docs/manual/mod/quickreference.html.zh-cn.utf8
+--- apache2.orig/docs/manual/mod/quickreference.html.zh-cn.utf8
++++ apache2/docs/manual/mod/quickreference.html.zh-cn.utf8
+@@ -421,7 +421,7 @@ after a crash</td></tr>
+ in case of an error</td></tr>
+ <tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+ <tr><td><a href="core.html#errorlogformat"> ErrorLogFormat [connection|request] <var>format</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Format specification for error log entries</td></tr>
+-<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
++<tr class="odd"><td><a href="mod_example_hooks.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+ API</td></tr>
+ <tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+ headers</td></tr>
@@ -629,431 +629,432 @@ simultaneously</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
@@ -7347,11 +7522,9 @@ index 02b9015..617cb1d 100644
</table></div>
<div class="bottomlang">
<p><span>可用语言: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
-diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en
-index 7459f7a..03ed274 100644
---- a/docs/manual/programs/rotatelogs.html.en
-+++ b/docs/manual/programs/rotatelogs.html.en
-@@ -133,7 +133,7 @@ be sure the log file format has enough granularity to produce
+--- apache2.orig/docs/manual/programs/rotatelogs.html.en
++++ apache2/docs/manual/programs/rotatelogs.html.en
+@@ -133,7 +133,7 @@ be sure the log file format has enough g
a different file name each time the logs are rotated. Otherwise
rotation will overwrite the same file instead of starting a new
one. For example, if <var>logfile</var> was
@@ -7412,11 +7585,9 @@ index 7459f7a..03ed274 100644
startup and then truncating the file once per day. It is expected
in this scenario that a separate process (such as tail) would
process the file in real time.</p>
-diff --git a/docs/manual/programs/rotatelogs.html.fr b/docs/manual/programs/rotatelogs.html.fr
-index 9d8a4a5..8224dc4 100644
---- a/docs/manual/programs/rotatelogs.html.fr
-+++ b/docs/manual/programs/rotatelogs.html.fr
-@@ -139,7 +139,7 @@ poss
+--- apache2.orig/docs/manual/programs/rotatelogs.html.fr
++++ apache2/docs/manual/programs/rotatelogs.html.fr
+@@ -139,7 +139,7 @@ poss�de une granularit� suffisamment imp
fichier diff�rent � chaque rotation des journaux. Si ce n'est pas le
cas, la rotation va �craser le fichier existant au lieu d'en g�n�rer un
nouveau. Par exemple, si <var>fichier-journal</var> �tait
@@ -7425,7 +7596,7 @@ index 9d8a4a5..8224dc4 100644
m�gaoctets, et si la limite de 5 m�gaoctets a �t� atteinte deux fois
dans la m�me journ�e, le m�me nom de fichier va �tre g�n�r�, et la
rotation va �craser le fichier existant.</p>
-@@ -182,10 +182,10 @@ sp
+@@ -182,10 +182,10 @@ sp�cifier un d�calage.</dd>
<h2><a name="examples" id="examples">Exemples</a></h2>
<div class="example"><p><code>
@@ -7438,7 +7609,7 @@ index 9d8a4a5..8224dc4 100644
o� nnnn correspond au temps syst�me auquel la journalisation
d�marre effectivement (ce temps sera toujours un multiple du temps
de rotation, si bien que vous pouvez synchroniser les scripts cron
-@@ -193,23 +193,23 @@ sp
+@@ -193,23 +193,23 @@ sp�cifier un d�calage.</dd>
heures), une nouvelle journalisation d�marre.</p>
<div class="example"><p><code>
@@ -7466,7 +7637,7 @@ index 9d8a4a5..8224dc4 100644
</code></p></div>
<p>Cette directive va effectuer une rotation du fichier journal des
erreurs chaque fois que la taille de ce dernier atteindra 5
-@@ -217,10 +217,10 @@ sp
+@@ -217,10 +217,10 @@ sp�cifier un d�calage.</dd>
la forme <code>journal-erreurs.YYYY-mm-dd-HH_MM_SS</code>.</p>
<div class="example"><p><code>
@@ -7479,23 +7650,71 @@ index 9d8a4a5..8224dc4 100644
au d�marrage, puis une fois par jour. Ce sc�nario implique qu'un
processus s�par� (tel que tail) traite le fichier en temps
r�el.</p>
-diff --git a/docs/manual/programs/rotatelogs.html.tr.utf8 b/docs/manual/programs/rotatelogs.html.tr.utf8
-index f331bf8..2cff939 100644
---- a/docs/manual/programs/rotatelogs.html.tr.utf8
-+++ b/docs/manual/programs/rotatelogs.html.tr.utf8
-@@ -28,6 +28,7 @@
- <a href="../ko/programs/rotatelogs.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
- <a href="../tr/programs/rotatelogs.html" title="Türkçe"> tr </a></p>
- </div>
-+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
+--- apache2.orig/docs/manual/programs/rotatelogs.html.tr.utf8
++++ apache2/docs/manual/programs/rotatelogs.html.tr.utf8
+@@ -130,7 +130,7 @@
+ ismi üretecek yeterlilikte parçacıklı yapıya sahip olduğundan emin
+ olmalısınız. Aks takdirde döndürme işlemi yeni bir dosya başlatmak yerine
+ hep aynı dosyanın üzerine yazar. Örneğin, <var>logfile</var> için
+- <code>/var/logs/errorlog.%Y-%m-%d</code> belirtilmişse 5 mega baytta bir
++ <code>/var/log/errorlog.%Y-%m-%d</code> belirtilmişse 5 mega baytta bir
+ yeni bir günlük dosyasına başlanacaktır. Fakat 5 megabayta gün içinde iki
+ kez ulaşılırsa aynı günlük dosyası üretilir ve günlük hep aynı dosyanın
+ üzerine yazılır.</p>
+@@ -164,42 +164,42 @@
+ <h2><a name="examples" id="examples">Örnekler</a></h2>
+
+ <div class="example"><p><code>
+- CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common
++ CustomLog "|bin/rotatelogs /var/log/logfile 86400" common
+ </code></p></div>
+
+ <p>nnnn, günlük kaydının başladığı sistem zamanı olmak üzere
+- /var/logs/logfile.nnnn dosyası oluşturulur. Bu zaman, daima döngü
++ /var/log/logfile.nnnn dosyası oluşturulur. Bu zaman, daima döngü
+ süresinin katları olacağından bunu cron betiklerinizi eşzamanlamakta
+ kullanabilirsiniz. Her döngü süresinin sonunda (burada 24 saat sonra)
+ yeni bir günlük dosyası açılır.</p>
+
+ <div class="example"><p><code>
+- CustomLog "|bin/rotatelogs -l /var/logs/logfile.%Y.%m.%d 86400" common
++ CustomLog "|bin/rotatelogs -l /var/log/logfile.%Y.%m.%d 86400" common
+ </code></p></div>
+
+ <p>yyyy, yıl; mm, ay; dd, ayın gününü belirtmek üzere
+- /var/logs/logfile.yyyy.mm.dd dosyası oluşturulur. Her gün yerel zamanla
++ /var/log/logfile.yyyy.mm.dd dosyası oluşturulur. Her gün yerel zamanla
+ geceyarısı yeni bir günlük dosyasına geçilecektir.</p>
+
+ <div class="example"><p><code>
+- CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
++ CustomLog "|bin/rotatelogs /var/log/logfile 5M" common
+ </code></p></div>
+
+ <p>Günlük dosyası 5 megabaytlık olunca yenisinin oluşturulmasını sağlar.
+ </p>
+
+ <div class="example"><p><code>
+- ErrorLog "|bin/rotatelogs /var/logs/errorlog.%Y-%m-%d-%H_%M_%S 5M"
++ ErrorLog "|bin/rotatelogs /var/log/errorlog.%Y-%m-%d-%H_%M_%S 5M"
+ </code></p></div>
+ <p>Hata günlüğünün 5 megabaytta bir
+ <code>errorlog.YYYY-mm-dd-HH_MM_SS</code> biçemli bir isimle
+ oluşturulmasını sağlar.</p>
- <p><code><strong>rotatelogs</strong></code>, Apache'nin borulu günlük
- dosyaları özelliği ile birlikte kullanmak için tasarlanmış basit bir
-diff --git a/docs/manual/rewrite/advanced.html.en b/docs/manual/rewrite/advanced.html.en
-index 0ced28f..885b7ea 100644
---- a/docs/manual/rewrite/advanced.html.en
-+++ b/docs/manual/rewrite/advanced.html.en
-@@ -36,10 +36,9 @@ them, rather than merely cutting and pasting the examples into your
+ <div class="example"><p><code>
+- CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common
++ CustomLog "|bin/rotatelogs -t /var/log/logfile 86400" common
+ </code></p></div>
+
+- <p>/var/logs/logfile dosyasını oluşturur, sunucu başlatılırken ve günde
++ <p>/var/log/logfile dosyasını oluşturur, sunucu başlatılırken ve günde
+ bir kere dosyanın tepesi kırpılır. Bu senaryoda ayrı bir sürecin (tail
+ gibi) dosyayı gerçek zamanlı işleyeceği umulur.</p>
+
+--- apache2.orig/docs/manual/rewrite/advanced.html.en
++++ apache2/docs/manual/rewrite/advanced.html.en
+@@ -36,10 +36,9 @@ them, rather than merely cutting and pas
configuration.</div>
</div>
@@ -7516,10 +7735,11 @@ index 0ced28f..885b7ea 100644
-@@ -192,158 +191,6 @@ featureful than anything you can cobble together using mod_rewrite.</p>
+@@ -191,158 +190,6 @@ featureful than anything you can cobble
+ </dl>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
- <div class="section">
+-<div class="section">
-<h2><a name="autorefresh" id="autorefresh">Document With Autorefresh</a></h2>
-
-
@@ -7671,15 +7891,12 @@ index 0ced28f..885b7ea 100644
- </dl>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
--<div class="section">
+ <div class="section">
<h2><a name="structuredhomedirs" id="structuredhomedirs">Structured Userdirs</a></h2>
-
-diff --git a/docs/manual/rewrite/advanced.html.fr b/docs/manual/rewrite/advanced.html.fr
-index 054f3ff..29106f5 100644
---- a/docs/manual/rewrite/advanced.html.fr
-+++ b/docs/manual/rewrite/advanced.html.fr
-@@ -41,7 +41,6 @@ simplement les copier/coller dans votre configuration.</div>
+--- apache2.orig/docs/manual/rewrite/advanced.html.fr
++++ apache2/docs/manual/rewrite/advanced.html.fr
+@@ -41,7 +41,6 @@ simplement les copier/coller dans votre
d'arri�re-plan en fonction de l'adresse IP</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#on-the-fly-content">R�g�neration de contenu � la vol�e</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#load-balancing">R�partition de charge</a></li>
@@ -7687,7 +7904,7 @@ index 054f3ff..29106f5 100644
<li><img alt="" src="../images/down.gif" /> <a href="#structuredhomedirs">R�pertoires Home structur�s</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#redirectanchors">Redirection des ancrages</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#time-dependent">R��criture d�pendant de l'heure</a></li>
-@@ -205,161 +204,6 @@ plus de fonctionnalit
+@@ -205,161 +204,6 @@ plus de fonctionnalit�s dans ce domaine
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -7849,7 +8066,7 @@ index 054f3ff..29106f5 100644
<h2><a name="structuredhomedirs" id="structuredhomedirs">R�pertoires Home structur�s</a></h2>
-@@ -463,8 +307,7 @@ RewriteRule ^/~(<strong>([a-z])</strong>[a-z0-9]+)(.*) /home/<strong>$2</stro
+@@ -463,8 +307,7 @@ RewriteRule ^/~(<strong>([a-z])</stron
la fen�tre de temps configur�e. On peut utiliser
<code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code> pour contourner ce probl�me. Il est
cependant bien plus commode de servir un contenu dynamique, et
@@ -7859,11 +8076,9 @@ index 054f3ff..29106f5 100644
</dl>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-diff --git a/docs/manual/rewrite/rewritemap.html.fr b/docs/manual/rewrite/rewritemap.html.fr
-index 12f1773..941f37f 100644
---- a/docs/manual/rewrite/rewritemap.html.fr
-+++ b/docs/manual/rewrite/rewritemap.html.fr
-@@ -163,7 +163,7 @@ RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]</pre>
+--- apache2.orig/docs/manual/rewrite/rewritemap.html.fr
++++ apache2/docs/manual/rewrite/rewritemap.html.fr
+@@ -163,7 +163,7 @@ RewriteRule ^/product/(.*) /prods.php?id
<p>Nous supposons ici que le script <code>prods.php</code> sait quoi
@@ -7872,10 +8087,8 @@ index 12f1773..941f37f 100644
le cas o� le produit ne se trouve pas dans la table de
correspondances.</p>
-diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
-index e8e9bd0..3a4e24e 100644
---- a/docs/manual/style/version.ent
-+++ b/docs/manual/style/version.ent
+--- apache2.orig/docs/manual/style/version.ent
++++ apache2/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
<!ENTITY httpd.major "2">
@@ -7884,10 +8097,8 @@ index e8e9bd0..3a4e24e 100644
+<!ENTITY httpd.patch "11">
<!ENTITY httpd.docs "2.4">
-diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
-index 48515f9..a80395c 100644
---- a/docs/manual/vhosts/name-based.html.en
-+++ b/docs/manual/vhosts/name-based.html.en
+--- apache2.orig/docs/manual/vhosts/name-based.html.en
++++ apache2/docs/manual/vhosts/name-based.html.en
@@ -118,7 +118,7 @@
inherited from the base server configuration. If no server name was
specified globally, one is detected at startup through reverse DNS resolution
@@ -7897,11 +8108,9 @@ index 48515f9..a80395c 100644
explicitly list a <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> in every
name-based virtual host.</p>
</div>
-diff --git a/docs/manual/vhosts/name-based.html.fr b/docs/manual/vhosts/name-based.html.fr
-index d4972a1..9bfca65 100644
---- a/docs/manual/vhosts/name-based.html.fr
-+++ b/docs/manual/vhosts/name-based.html.fr
-@@ -89,7 +89,7 @@ virtuel bas
+--- apache2.orig/docs/manual/vhosts/name-based.html.fr
++++ apache2/docs/manual/vhosts/name-based.html.fr
+@@ -89,7 +89,7 @@ virtuel bas� sur le nom appropri�</a></h
(la plus exacte) correspondance avec la paire adresse IP/port
utilis�e dans la requ�te. Si plusieurs serveurs virtuels poss�dent
cette m�me paire adresse IP/port, Apache va ensuite comparer les
@@ -7910,22 +8119,8 @@ index d4972a1..9bfca65 100644
pr�sent dans la requ�te.</p>
<h3><a name="defaultvhost" id="defaultvhost">Le serveur virtuel � base de nom
-diff --git a/docs/manual/vhosts/name-based.html.tr.utf8 b/docs/manual/vhosts/name-based.html.tr.utf8
-index b4dad46..4a8a34d 100644
---- a/docs/manual/vhosts/name-based.html.tr.utf8
-+++ b/docs/manual/vhosts/name-based.html.tr.utf8
-@@ -28,6 +28,7 @@
- <a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
- <a href="../tr/vhosts/name-based.html" title="Türkçe"> tr </a></p>
- </div>
-+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
-
- <p>Bu belgede isme dayalı sanal konakların ne zaman, nasıl kullanılacakları
- açıklanmıştır.</p>
-diff --git a/include/ap_mmn.h b/include/ap_mmn.h
-index a36a999..83d9794 100644
---- a/include/ap_mmn.h
-+++ b/include/ap_mmn.h
+--- apache2.orig/include/ap_mmn.h
++++ apache2/include/ap_mmn.h
@@ -432,6 +432,7 @@
* 20120211.35 (2.4.10-dev) Add "r", "must_rebind", and last_backend_conn
to util_ldap_connection_t
@@ -7943,10 +8138,8 @@ index a36a999..83d9794 100644
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
-diff --git a/include/http_connection.h b/include/http_connection.h
-index f73670b..11f8dd1 100644
---- a/include/http_connection.h
-+++ b/include/http_connection.h
+--- apache2.orig/include/http_connection.h
++++ apache2/include/http_connection.h
@@ -32,10 +32,6 @@
#ifdef __cplusplus
extern "C" {
@@ -7958,17 +8151,15 @@ index f73670b..11f8dd1 100644
/**
* This is the protocol module driver. This calls all of the
-@@ -145,5 +141,5 @@ AP_DECLARE(apr_bucket *) ap_bucket_eoc_create(apr_bucket_alloc_t *list);
+@@ -145,5 +141,5 @@ AP_DECLARE(apr_bucket *) ap_bucket_eoc_c
}
#endif
-#endif /* !APACHE_HTTP_REQUEST_H */
+#endif /* !APACHE_HTTP_CONNECTION_H */
/** @} */
-diff --git a/include/http_core.h b/include/http_core.h
-index 8730d1f..5cef622 100644
---- a/include/http_core.h
-+++ b/include/http_core.h
+--- apache2.orig/include/http_core.h
++++ apache2/include/http_core.h
@@ -667,6 +667,10 @@ typedef struct {
#define AP_TRACE_ENABLE 1
#define AP_TRACE_EXTENDED 2
@@ -7980,10 +8171,8 @@ index 8730d1f..5cef622 100644
} core_server_config;
-diff --git a/include/httpd.h b/include/httpd.h
-index e1510be..c6cd827 100644
---- a/include/httpd.h
-+++ b/include/httpd.h
+--- apache2.orig/include/httpd.h
++++ apache2/include/httpd.h
@@ -1035,6 +1035,11 @@ struct request_rec {
*/
apr_sockaddr_t *useragent_addr;
@@ -7996,10 +8185,8 @@ index e1510be..c6cd827 100644
};
/**
-diff --git a/include/util_md5.h b/include/util_md5.h
-index 4b5edd6..0287ef9 100644
---- a/include/util_md5.h
-+++ b/include/util_md5.h
+--- apache2.orig/include/util_md5.h
++++ apache2/include/util_md5.h
@@ -33,38 +33,34 @@ extern "C" {
#include "apr_md5.h"
@@ -8052,10 +8239,8 @@ index 4b5edd6..0287ef9 100644
*/
AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
-diff --git a/include/util_varbuf.h b/include/util_varbuf.h
-index cf4bc7f..8e45578 100644
---- a/include/util_varbuf.h
-+++ b/include/util_varbuf.h
+--- apache2.orig/include/util_varbuf.h
++++ apache2/include/util_varbuf.h
@@ -18,12 +18,13 @@
* @file util_varbuf.h
* @brief Apache resizable variable length buffer library
@@ -8209,7 +8394,7 @@ index cf4bc7f..8e45578 100644
* @note ap_varbuf_pdup() uses vb->strlen to determine how much memory to
* copy. It works even if 0-bytes are embedded in vb->buf, prepend, or
* append.
-@@ -135,23 +142,25 @@ AP_DECLARE(char *) ap_varbuf_pdup(apr_pool_t *p, struct ap_varbuf *vb,
+@@ -135,23 +142,25 @@ AP_DECLARE(char *) ap_varbuf_pdup(apr_po
apr_size_t *new_len);
@@ -8246,7 +8431,7 @@ index cf4bc7f..8e45578 100644
* @return APR_SUCCESS if successful
* @note Just like ap_pregsub(), this function does not copy the part of
* *source before the matching part (i.e. the first pmatch[0].rm_so
-@@ -166,11 +175,12 @@ AP_DECLARE(apr_status_t) ap_varbuf_regsub(struct ap_varbuf *vb,
+@@ -166,11 +175,12 @@ AP_DECLARE(apr_status_t) ap_varbuf_regsu
ap_regmatch_t pmatch[],
apr_size_t maxlen);
@@ -8264,10 +8449,8 @@ index cf4bc7f..8e45578 100644
* @note vb->strlen will be set to the length of the line
* @note If vb->strlen equals AP_VARBUF_UNKNOWN, it will be set to
* strlen(vb->buf) first.
-diff --git a/include/util_xml.h b/include/util_xml.h
-index e60d348..9faaed1 100644
---- a/include/util_xml.h
-+++ b/include/util_xml.h
+--- apache2.orig/include/util_xml.h
++++ apache2/include/util_xml.h
@@ -35,11 +35,10 @@ extern "C" {
#endif
@@ -8283,11 +8466,9 @@ index e60d348..9faaed1 100644
*/
AP_DECLARE(int) ap_xml_parse_input(request_rec *r, apr_xml_doc **pdoc);
-diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
-index 75044d4..ee4f185 100644
---- a/modules/aaa/mod_auth_basic.c
-+++ b/modules/aaa/mod_auth_basic.c
-@@ -315,8 +315,8 @@ static int authenticate_basic_user(request_rec *r)
+--- apache2.orig/modules/aaa/mod_auth_basic.c
++++ apache2/modules/aaa/mod_auth_basic.c
+@@ -315,8 +315,8 @@ static int authenticate_basic_user(reque
/* We need an authentication realm. */
if (!ap_auth_name(r)) {
@@ -8298,11 +8479,9 @@ index 75044d4..ee4f185 100644
return HTTP_INTERNAL_SERVER_ERROR;
}
-diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
-index cfb4a7f..263c8e6 100644
---- a/modules/aaa/mod_auth_form.c
-+++ b/modules/aaa/mod_auth_form.c
-@@ -903,16 +903,16 @@ static int authenticate_form_authn(request_rec * r)
+--- apache2.orig/modules/aaa/mod_auth_form.c
++++ apache2/modules/aaa/mod_auth_form.c
+@@ -903,16 +903,16 @@ static int authenticate_form_authn(reque
* never be secure. Abort the auth attempt in this case.
*/
if (PROXYREQ_PROXY == r->proxyreq) {
@@ -8323,11 +8502,9 @@ index cfb4a7f..263c8e6 100644
return HTTP_INTERNAL_SERVER_ERROR;
}
-diff --git a/modules/aaa/mod_authnz_fcgi.c b/modules/aaa/mod_authnz_fcgi.c
-index 673b0e7..5e4a937 100644
---- a/modules/aaa/mod_authnz_fcgi.c
-+++ b/modules/aaa/mod_authnz_fcgi.c
-@@ -472,7 +472,7 @@ static apr_status_t handle_response(const fcgi_provider_conf *conf,
+--- apache2.orig/modules/aaa/mod_authnz_fcgi.c
++++ apache2/modules/aaa/mod_authnz_fcgi.c
+@@ -472,7 +472,7 @@ static apr_status_t handle_response(cons
{
apr_bucket *b;
apr_bucket_brigade *ob;
@@ -8336,11 +8513,9 @@ index 673b0e7..5e4a937 100644
apr_status_t rv = APR_SUCCESS;
const char *fn = "handle_response";
int header_state = HDR_STATE_READING_HEADERS;
-diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
-index c9ed22f..c68b56b 100644
---- a/modules/aaa/mod_authz_core.c
-+++ b/modules/aaa/mod_authz_core.c
-@@ -168,6 +168,13 @@ static void *merge_authz_core_dir_config(apr_pool_t *p,
+--- apache2.orig/modules/aaa/mod_authz_core.c
++++ apache2/modules/aaa/mod_authz_core.c
+@@ -168,6 +168,13 @@ static void *merge_authz_core_dir_config
return (void*)conf;
}
@@ -8363,11 +8538,9 @@ index c9ed22f..c68b56b 100644
authz_cmds,
register_hooks /* register hooks */
};
-diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
-index a6e15e7..cf535d3 100644
---- a/modules/arch/netware/mod_nw_ssl.c
-+++ b/modules/arch/netware/mod_nw_ssl.c
-@@ -1086,7 +1086,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
+--- apache2.orig/modules/arch/netware/mod_nw_ssl.c
++++ apache2/modules/arch/netware/mod_nw_ssl.c
+@@ -1086,7 +1086,7 @@ char *ssl_var_lookup(apr_pool_t *p, serv
else if (strcEQ(var, "SERVER_SOFTWARE"))
result = ap_get_server_banner();
else if (strcEQ(var, "API_VERSION")) {
@@ -8376,11 +8549,9 @@ index a6e15e7..cf535d3 100644
resdup = FALSE;
}
else if (strcEQ(var, "TIME_YEAR")) {
-diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
-index 801c7de..ce0875a 100644
---- a/modules/arch/win32/mod_isapi.c
-+++ b/modules/arch/win32/mod_isapi.c
-@@ -955,7 +955,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+--- apache2.orig/modules/arch/win32/mod_isapi.c
++++ apache2/modules/arch/win32/mod_isapi.c
+@@ -955,7 +955,7 @@ static int APR_THREAD_FUNC regfnServerSu
return 1;
}
else if (cid->dconf.log_unsupported) {
@@ -8389,7 +8560,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_DONE_WITH_SESSION is not supported: %s",
r->filename);
-@@ -1000,7 +1000,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1000,7 +1000,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_GET_SSPI_INFO:
if (cid->dconf.log_unsupported)
@@ -8398,7 +8569,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction HSE_REQ_GET_SSPI_INFO "
"is not supported: %s", r->filename);
apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));
-@@ -1035,7 +1035,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1035,7 +1035,7 @@ static int APR_THREAD_FUNC regfnServerSu
return 1;
}
if (cid->dconf.log_unsupported)
@@ -8407,7 +8578,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction HSE_REQ_IO_COMPLETION "
"is not supported: %s", r->filename);
apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));
-@@ -1055,7 +1055,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1055,7 +1055,7 @@ static int APR_THREAD_FUNC regfnServerSu
if (!cid->dconf.fake_async && (tf->dwFlags & HSE_IO_ASYNC)) {
if (cid->dconf.log_unsupported)
@@ -8416,7 +8587,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction HSE_REQ_TRANSMIT_FILE "
"as HSE_IO_ASYNC is not supported: %s", r->filename);
apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));
-@@ -1170,7 +1170,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1170,7 +1170,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_REFRESH_ISAPI_ACL:
if (cid->dconf.log_unsupported)
@@ -8425,7 +8596,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_REFRESH_ISAPI_ACL "
"is not supported: %s", r->filename);
-@@ -1227,7 +1227,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1227,7 +1227,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_GET_IMPERSONATION_TOKEN: /* Added in ISAPI 4.0 */
if (cid->dconf.log_unsupported)
@@ -8434,7 +8605,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_GET_IMPERSONATION_TOKEN "
"is not supported: %s", r->filename);
-@@ -1306,7 +1306,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1306,7 +1306,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_ABORTIVE_CLOSE:
if (cid->dconf.log_unsupported)
@@ -8443,7 +8614,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE"
" is not supported: %s", r->filename);
apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));
-@@ -1314,7 +1314,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1314,7 +1314,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_GET_CERT_INFO_EX: /* Added in ISAPI 4.0 */
if (cid->dconf.log_unsupported)
@@ -8452,7 +8623,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_GET_CERT_INFO_EX "
"is not supported: %s", r->filename);
-@@ -1363,7 +1363,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1363,7 +1363,7 @@ static int APR_THREAD_FUNC regfnServerSu
case HSE_REQ_CLOSE_CONNECTION: /* Added after ISAPI 4.0 */
if (cid->dconf.log_unsupported)
@@ -8461,7 +8632,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_CLOSE_CONNECTION "
"is not supported: %s", r->filename);
-@@ -1381,7 +1381,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1381,7 +1381,7 @@ static int APR_THREAD_FUNC regfnServerSu
/* Undocumented - defined by the Microsoft Jan '00 Platform SDK
*/
if (cid->dconf.log_unsupported)
@@ -8470,7 +8641,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction "
"HSE_REQ_EXTENSION_TRIGGER "
"is not supported: %s", r->filename);
-@@ -1390,7 +1390,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid,
+@@ -1390,7 +1390,7 @@ static int APR_THREAD_FUNC regfnServerSu
default:
if (cid->dconf.log_unsupported)
@@ -8479,7 +8650,7 @@ index 801c7de..ce0875a 100644
"ServerSupportFunction (%d) not supported: "
"%s", HSE_code, r->filename);
apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));
-@@ -1702,7 +1702,7 @@ static int isapi_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+@@ -1702,7 +1702,7 @@ static int isapi_pre_config(apr_pool_t *
rv = apr_thread_mutex_create(&loaded.lock, APR_THREAD_MUTEX_DEFAULT,
loaded.pool);
if (rv != APR_SUCCESS) {
@@ -8488,11 +8659,9 @@ index 801c7de..ce0875a 100644
"Failed to create module cache lock");
return rv;
}
-diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
-index bf45093..6368af0 100644
---- a/modules/cache/cache_util.c
-+++ b/modules/cache/cache_util.c
-@@ -443,7 +443,7 @@ int ap_cache_check_no_cache(cache_request_rec *cache, request_rec *r)
+--- apache2.orig/modules/cache/cache_util.c
++++ apache2/modules/cache/cache_util.c
+@@ -443,7 +443,7 @@ int ap_cache_check_no_cache(cache_reques
return 0;
}
else {
@@ -8501,7 +8670,7 @@ index bf45093..6368af0 100644
"Incoming request is asking for an uncached version of "
"%s, but we have been configured to ignore it and serve "
"cached content anyway", r->unparsed_uri);
-@@ -483,7 +483,7 @@ int ap_cache_check_no_store(cache_request_rec *cache, request_rec *r)
+@@ -483,7 +483,7 @@ int ap_cache_check_no_store(cache_reques
return 0;
}
else {
@@ -8510,11 +8679,22 @@ index bf45093..6368af0 100644
"Incoming request is asking for a no-store version of "
"%s, but we have been configured to ignore it and serve "
"cached content anyway", r->unparsed_uri);
-diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c
-index 6df596a..eeacec6 100644
---- a/modules/core/mod_so.c
-+++ b/modules/core/mod_so.c
-@@ -209,8 +209,8 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+@@ -1258,8 +1258,10 @@ apr_table_t *cache_merge_headers_out(req
+
+ if (r->content_type
+ && !apr_table_get(headers_out, "Content-Type")) {
+- apr_table_setn(headers_out, "Content-Type",
+- ap_make_content_type(r, r->content_type));
++ const char *ctype = ap_make_content_type(r, r->content_type);
++ if (ctype) {
++ apr_table_setn(headers_out, "Content-Type", ctype);
++ }
+ }
+
+ if (r->content_encoding
+--- apache2.orig/modules/core/mod_so.c
++++ apache2/modules/core/mod_so.c
+@@ -209,8 +209,8 @@ static const char *load_module(cmd_parms
for (i = 0; i < sconf->loaded_modules->nelts; i++) {
modi = &modie[i];
if (modi->name != NULL && strcmp(modi->name, modname) == 0) {
@@ -8525,10 +8705,8 @@ index 6df596a..eeacec6 100644
modname);
return NULL;
}
-diff --git a/modules/core/mod_watchdog.h b/modules/core/mod_watchdog.h
-index 13d23ba..8e7112c 100644
---- a/modules/core/mod_watchdog.h
-+++ b/modules/core/mod_watchdog.h
+--- apache2.orig/modules/core/mod_watchdog.h
++++ apache2/modules/core/mod_watchdog.h
@@ -21,9 +21,9 @@
* @file mod_watchdog.h
* @brief Watchdog module for Apache
@@ -8541,17 +8719,15 @@ index 13d23ba..8e7112c 100644
*/
#include "httpd.h"
-@@ -210,4 +210,4 @@ APR_DECLARE_EXTERNAL_HOOK(ap, AP_WD, int, watchdog_step, (
+@@ -210,4 +210,4 @@ APR_DECLARE_EXTERNAL_HOOK(ap, AP_WD, int
#endif
#endif /* MOD_WATCHDOG_H */
-/** \@} */
+/** @} */
-diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
-index 5ff1ea2..7212665 100644
---- a/modules/database/mod_dbd.c
-+++ b/modules/database/mod_dbd.c
-@@ -327,7 +327,7 @@ DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query,
+--- apache2.orig/modules/database/mod_dbd.c
++++ apache2/modules/database/mod_dbd.c
+@@ -327,7 +327,7 @@ DBD_DECLARE_NONSTD(void) ap_dbd_prepare(
if (apr_hash_get(svr->cfg->queries, label, APR_HASH_KEY_STRING)
&& strcmp(query, "")) {
@@ -8560,7 +8736,7 @@ index 5ff1ea2..7212665 100644
"conflicting SQL statements with label %s", label);
}
-@@ -799,7 +799,8 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
+@@ -799,7 +799,8 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_ope
/* If nothing is configured, we shouldn't be here */
if (cfg->name == no_dbdriver) {
@@ -8570,7 +8746,7 @@ index 5ff1ea2..7212665 100644
return NULL;
}
-@@ -822,7 +823,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
+@@ -822,7 +823,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_ope
rv = apr_reslist_acquire(group->reslist, (void*) &rec);
if (rv != APR_SUCCESS) {
@@ -8579,11 +8755,9 @@ index 5ff1ea2..7212665 100644
"Failed to acquire DBD connection from pool!");
return NULL;
}
-diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
-index af90db6..497c582 100644
---- a/modules/filters/mod_include.c
-+++ b/modules/filters/mod_include.c
-@@ -968,8 +968,8 @@ static APR_INLINE int re_check(include_ctx_t *ctx, const char *string,
+--- apache2.orig/modules/filters/mod_include.c
++++ apache2/modules/filters/mod_include.c
+@@ -968,8 +968,8 @@ static APR_INLINE int re_check(include_c
compiled = ap_pregcomp(ctx->dpool, rexp, AP_REG_EXTENDED);
if (!compiled) {
@@ -8594,7 +8768,7 @@ index af90db6..497c582 100644
return -1;
}
-@@ -1698,7 +1698,7 @@ static int find_file(request_rec *r, const char *directive, const char *tag,
+@@ -1698,7 +1698,7 @@ static int find_file(request_rec *r, con
APR_FILEPATH_NOTABSOLUTE, r->pool);
if (rv != APR_SUCCESS) {
@@ -8603,7 +8777,7 @@ index af90db6..497c582 100644
"in parsed file %s";
}
else {
-@@ -1711,13 +1711,13 @@ static int find_file(request_rec *r, const char *directive, const char *tag,
+@@ -1711,13 +1711,13 @@ static int find_file(request_rec *r, con
if ((rv = apr_stat(finfo, to_send,
APR_FINFO_GPROT | APR_FINFO_MIN, rr->pool)) != APR_SUCCESS
&& rv != APR_INCOMPLETE) {
@@ -8621,11 +8795,9 @@ index af90db6..497c582 100644
}
}
-diff --git a/modules/filters/mod_ratelimit.c b/modules/filters/mod_ratelimit.c
-index 939ab8e..59e130e 100644
---- a/modules/filters/mod_ratelimit.c
-+++ b/modules/filters/mod_ratelimit.c
-@@ -146,7 +146,7 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb)
+--- apache2.orig/modules/filters/mod_ratelimit.c
++++ apache2/modules/filters/mod_ratelimit.c
+@@ -146,7 +146,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
if (rv != APR_SUCCESS) {
ctx->state = RATE_ERROR;
@@ -8634,7 +8806,7 @@ index 939ab8e..59e130e 100644
"rl: full speed brigade pass failed.");
}
}
-@@ -218,7 +218,7 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb)
+@@ -218,7 +218,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
if (rv != APR_SUCCESS) {
ctx->state = RATE_ERROR;
@@ -8643,11 +8815,9 @@ index 939ab8e..59e130e 100644
"rl: brigade pass failed.");
break;
}
-diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
-index a4202a2..d28c97d 100644
---- a/modules/filters/mod_xml2enc.c
-+++ b/modules/filters/mod_xml2enc.c
-@@ -142,8 +142,7 @@ static void fix_skipto(request_rec* r, xml2ctx* ctx)
+--- apache2.orig/modules/filters/mod_xml2enc.c
++++ apache2/modules/filters/mod_xml2enc.c
+@@ -142,8 +142,7 @@ static void fix_skipto(request_rec* r, x
&bstart);
ap_assert(rv == APR_SUCCESS);
while (b = APR_BRIGADE_FIRST(ctx->bbsave), b != bstart) {
@@ -8657,7 +8827,7 @@ index a4202a2..d28c97d 100644
}
ctx->bytes -= (p-ctx->buf);
ctx->buf = p ;
-@@ -228,8 +227,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
+@@ -228,8 +227,7 @@ static void sniff_encoding(request_rec*
/* cut out the <meta> we're invalidating */
while (cutb != cute) {
b = APR_BUCKET_NEXT(cutb);
@@ -8667,7 +8837,7 @@ index a4202a2..d28c97d 100644
cutb = b;
}
/* and leave a string */
-@@ -435,8 +433,7 @@ static apr_status_t xml2enc_ffunc(ap_filter_t* f, apr_bucket_brigade* bb)
+@@ -435,8 +433,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
/* remove the data we've just read */
rv = apr_brigade_partition(bb, bytes, &bstart);
while (b = APR_BRIGADE_FIRST(bb), b != bstart) {
@@ -8677,11 +8847,9 @@ index a4202a2..d28c97d 100644
}
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01438)
"xml2enc: consuming %" APR_SIZE_T_FMT
-diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
-index 3d36c77..79f83d7 100644
---- a/modules/generators/mod_autoindex.c
-+++ b/modules/generators/mod_autoindex.c
-@@ -1416,7 +1416,7 @@ static char *terminate_description(autoindex_config_rec *d, char *desc,
+--- apache2.orig/modules/generators/mod_autoindex.c
++++ apache2/modules/generators/mod_autoindex.c
+@@ -1416,7 +1416,7 @@ static char *terminate_description(autoi
apr_int32_t autoindex_opts, int desc_width)
{
int maxsize = desc_width;
@@ -8690,11 +8858,9 @@ index 3d36c77..79f83d7 100644
/*
* If there's no DescriptionWidth in effect, default to the old
-diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
-index 09f1956..de585c5 100644
---- a/modules/http/byterange_filter.c
-+++ b/modules/http/byterange_filter.c
-@@ -380,8 +380,7 @@ static apr_status_t copy_brigade_range(apr_bucket_brigade *bb,
+--- apache2.orig/modules/http/byterange_filter.c
++++ apache2/modules/http/byterange_filter.c
+@@ -380,8 +380,7 @@ static apr_status_t copy_brigade_range(a
return rv;
}
out_first = APR_BUCKET_NEXT(copy);
@@ -8704,7 +8870,7 @@ index 09f1956..de585c5 100644
}
else {
out_first = copy;
-@@ -400,8 +399,7 @@ static apr_status_t copy_brigade_range(apr_bucket_brigade *bb,
+@@ -400,8 +399,7 @@ static apr_status_t copy_brigade_range(a
}
copy = APR_BUCKET_NEXT(copy);
if (copy != APR_BRIGADE_SENTINEL(bbout)) {
@@ -8714,11 +8880,9 @@ index 09f1956..de585c5 100644
}
}
break;
-diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
-index 2a0a979..0b86009 100644
---- a/modules/http/http_filters.c
-+++ b/modules/http/http_filters.c
-@@ -231,6 +231,49 @@ static apr_status_t get_chunk_line(http_ctx_t *ctx, apr_bucket_brigade *b,
+--- apache2.orig/modules/http/http_filters.c
++++ apache2/modules/http/http_filters.c
+@@ -231,6 +231,49 @@ static apr_status_t get_chunk_line(http_
}
@@ -8768,7 +8932,7 @@ index 2a0a979..0b86009 100644
/* This is the HTTP_INPUT filter for HTTP requests and responses from
* proxied servers (mod_proxy). It handles chunked and content-length
* bodies. This can only be inserted/used after the headers
-@@ -240,6 +283,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
+@@ -240,6 +283,7 @@ apr_status_t ap_http_filter(ap_filter_t
ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes)
{
@@ -8776,7 +8940,7 @@ index 2a0a979..0b86009 100644
apr_bucket *e;
http_ctx_t *ctx = f->ctx;
apr_status_t rv;
-@@ -247,6 +291,9 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
+@@ -247,6 +291,9 @@ apr_status_t ap_http_filter(ap_filter_t
int http_error = HTTP_REQUEST_ENTITY_TOO_LARGE;
apr_bucket_brigade *bb;
@@ -8786,7 +8950,7 @@ index 2a0a979..0b86009 100644
/* just get out of the way of things we don't want. */
if (mode != AP_MODE_READBYTES && mode != AP_MODE_GETLINE) {
return ap_get_brigade(f->next, b, mode, block, readbytes);
-@@ -425,13 +472,8 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
+@@ -425,13 +472,8 @@ apr_status_t ap_http_filter(ap_filter_t
}
if (!ctx->remaining) {
@@ -8802,7 +8966,7 @@ index 2a0a979..0b86009 100644
}
}
}
-@@ -534,13 +576,8 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
+@@ -534,13 +576,8 @@ apr_status_t ap_http_filter(ap_filter_t
}
if (!ctx->remaining) {
@@ -8818,11 +8982,9 @@ index 2a0a979..0b86009 100644
}
}
break;
-diff --git a/modules/http/http_request.c b/modules/http/http_request.c
-index 796d506..cdfec8b 100644
---- a/modules/http/http_request.c
-+++ b/modules/http/http_request.c
-@@ -463,6 +463,7 @@ static request_rec *internal_internal_redirect(const char *new_uri,
+--- apache2.orig/modules/http/http_request.c
++++ apache2/modules/http/http_request.c
+@@ -463,6 +463,7 @@ static request_rec *internal_internal_re
new->main = r->main;
new->headers_in = r->headers_in;
@@ -8830,7 +8992,7 @@ index 796d506..cdfec8b 100644
new->headers_out = apr_table_make(r->pool, 12);
if (ap_is_HTTP_REDIRECT(new->status)) {
const char *location = apr_table_get(r->headers_out, "Location");
-@@ -470,6 +471,7 @@ static request_rec *internal_internal_redirect(const char *new_uri,
+@@ -470,6 +471,7 @@ static request_rec *internal_internal_re
apr_table_setn(new->headers_out, "Location", location);
}
new->err_headers_out = r->err_headers_out;
@@ -8838,7 +9000,7 @@ index 796d506..cdfec8b 100644
new->subprocess_env = rename_original_env(r->pool, r->subprocess_env);
new->notes = apr_table_make(r->pool, 5);
-@@ -583,6 +585,8 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
+@@ -583,6 +585,8 @@ AP_DECLARE(void) ap_internal_fast_redire
r->headers_out);
r->err_headers_out = apr_table_overlay(r->pool, rr->err_headers_out,
r->err_headers_out);
@@ -8847,11 +9009,9 @@ index 796d506..cdfec8b 100644
r->subprocess_env = apr_table_overlay(r->pool, rr->subprocess_env,
r->subprocess_env);
-diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
-index 792756d..c1b0e1b 100644
---- a/modules/loggers/mod_log_config.c
-+++ b/modules/loggers/mod_log_config.c
-@@ -431,6 +431,12 @@ static const char *log_header_in(request_rec *r, char *a)
+--- apache2.orig/modules/loggers/mod_log_config.c
++++ apache2/modules/loggers/mod_log_config.c
+@@ -431,6 +431,12 @@ static const char *log_header_in(request
return ap_escape_logitem(r->pool, apr_table_get(r->headers_in, a));
}
@@ -8864,7 +9024,7 @@ index 792756d..c1b0e1b 100644
static APR_INLINE char *find_multiple_headers(apr_pool_t *pool,
const apr_table_t *table,
const char *key)
-@@ -514,6 +520,11 @@ static const char *log_header_out(request_rec *r, char *a)
+@@ -514,6 +520,11 @@ static const char *log_header_out(reques
return ap_escape_logitem(r->pool, cp);
}
@@ -8876,7 +9036,7 @@ index 792756d..c1b0e1b 100644
static const char *log_note(request_rec *r, char *a)
{
return ap_escape_logitem(r->pool, apr_table_get(r->notes, a));
-@@ -916,7 +927,7 @@ static char *parse_log_misc_string(apr_pool_t *p, log_format_item *it,
+@@ -916,7 +927,7 @@ static char *parse_log_misc_string(apr_p
static char *parse_log_item(apr_pool_t *p, log_format_item *it, const char **sa)
{
const char *s = *sa;
@@ -8885,7 +9045,7 @@ index 792756d..c1b0e1b 100644
if (*s != '%') {
return parse_log_misc_string(p, it, sa);
-@@ -986,7 +997,16 @@ static char *parse_log_item(apr_pool_t *p, log_format_item *it, const char **sa)
+@@ -986,7 +997,16 @@ static char *parse_log_item(apr_pool_t *
break;
default:
@@ -8903,7 +9063,7 @@ index 792756d..c1b0e1b 100644
if (!handler) {
char dummy[2];
-@@ -1516,7 +1536,7 @@ static void ap_register_log_handler(apr_pool_t *p, char *tag,
+@@ -1516,7 +1536,7 @@ static void ap_register_log_handler(apr_
log_struct->func = handler;
log_struct->want_orig_default = def;
@@ -8912,7 +9072,7 @@ index 792756d..c1b0e1b 100644
}
static ap_log_writer_init *ap_log_set_writer_init(ap_log_writer_init *handle)
{
-@@ -1694,6 +1714,9 @@ static int log_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
+@@ -1694,6 +1714,9 @@ static int log_pre_config(apr_pool_t *p,
log_pfn_register(p, "U", log_request_uri, 1);
log_pfn_register(p, "s", log_status, 1);
log_pfn_register(p, "R", log_handler, 1);
@@ -8922,10 +9082,8 @@ index 792756d..c1b0e1b 100644
}
/* reset to default conditions */
-diff --git a/modules/lua/lua_apr.c b/modules/lua/lua_apr.c
-index 94761ba..fd3ba20 100644
---- a/modules/lua/lua_apr.c
-+++ b/modules/lua/lua_apr.c
+--- apache2.orig/modules/lua/lua_apr.c
++++ apache2/modules/lua/lua_apr.c
@@ -52,8 +52,8 @@ static int lua_table_set(lua_State *L)
while ( (badchar = ap_strchr(badchar, '\n')) ) {
*badchar = ' ';
@@ -8937,10 +9095,8 @@ index 94761ba..fd3ba20 100644
key, t->n);
apr_table_set(t->t, key, replacement);
}
-diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
-index 8b740c2..6dc6b9f 100644
---- a/modules/lua/lua_request.c
-+++ b/modules/lua/lua_request.c
+--- apache2.orig/modules/lua/lua_request.c
++++ apache2/modules/lua/lua_request.c
@@ -2086,13 +2086,13 @@ static int lua_set_cookie(lua_State *L)
if (expires > 0) {
rv = apr_rfc822_date(cdate, apr_time_from_sec(expires));
@@ -8957,7 +9113,7 @@ index 8b740c2..6dc6b9f 100644
}
/* Create domain segment */
-@@ -2171,13 +2171,13 @@ static int lua_websocket_greet(lua_State *L)
+@@ -2171,13 +2171,13 @@ static int lua_websocket_greet(lua_State
r->read_chunked = 0;
ap_rflush(r);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
@@ -8974,11 +9130,9 @@ index 8b740c2..6dc6b9f 100644
return 0;
}
-diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
-index 90f34cd..b2dca75 100644
---- a/modules/lua/mod_lua.c
-+++ b/modules/lua/mod_lua.c
-@@ -500,9 +500,9 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade
+--- apache2.orig/modules/lua/mod_lua.c
++++ apache2/modules/lua/mod_lua.c
+@@ -500,9 +500,9 @@ static apr_status_t lua_output_filter_ha
ap_remove_output_filter(f);
apr_brigade_cleanup(pbbIn);
apr_brigade_cleanup(ctx->tmpBucket);
@@ -8991,7 +9145,7 @@ index 90f34cd..b2dca75 100644
return HTTP_INTERNAL_SERVER_ERROR;
}
}
-@@ -2003,7 +2003,7 @@ static int lua_post_config(apr_pool_t *pconf, apr_pool_t *plog,
+@@ -2003,7 +2003,7 @@ static int lua_post_config(apr_pool_t *p
/* Create shared memory space */
rs = apr_temp_dir_get(&tempdir, pconf);
if (rs != APR_SUCCESS) {
@@ -9000,7 +9154,7 @@ index 90f34cd..b2dca75 100644
"mod_lua IVM: Failed to find temporary directory");
return HTTP_INTERNAL_SERVER_ERROR;
}
-@@ -2012,7 +2012,7 @@ static int lua_post_config(apr_pool_t *pconf, apr_pool_t *plog,
+@@ -2012,7 +2012,7 @@ static int lua_post_config(apr_pool_t *p
rs = apr_shm_create(&lua_ivm_shm, sizeof(apr_pool_t**),
(const char *) lua_ivm_shmfile, pconf);
if (rs != APR_SUCCESS) {
@@ -9009,11 +9163,9 @@ index 90f34cd..b2dca75 100644
"mod_lua: Failed to create shared memory segment on file %s",
lua_ivm_shmfile);
return HTTP_INTERNAL_SERVER_ERROR;
-diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
-index b331a6c..b0c1a9c 100644
---- a/modules/proxy/mod_proxy.c
-+++ b/modules/proxy/mod_proxy.c
-@@ -548,9 +548,9 @@ static const char *proxy_interpolate(request_rec *r, const char *str)
+--- apache2.orig/modules/proxy/mod_proxy.c
++++ apache2/modules/proxy/mod_proxy.c
+@@ -548,9 +548,9 @@ static const char *proxy_interpolate(req
return str;
}
/* OK, this is syntax we want to interpolate. Is there such a var ? */
@@ -9034,10 +9186,8 @@ index b331a6c..b0c1a9c 100644
/* Check URI's destination host against NoProxy hosts */
/* Bypass ProxyRemote server lookup if configured as NoProxy */
for (direct_connect = i = 0; i < conf->dirconn->nelts &&
-diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
-index e2fb59c..4c9bfb8 100644
---- a/modules/proxy/mod_proxy_fcgi.c
-+++ b/modules/proxy/mod_proxy_fcgi.c
+--- apache2.orig/modules/proxy/mod_proxy_fcgi.c
++++ apache2/modules/proxy/mod_proxy_fcgi.c
@@ -663,7 +663,7 @@ recv_again:
/* TODO: Should probably clean up this logging a bit... */
if (clen) {
@@ -9058,11 +9208,9 @@ index e2fb59c..4c9bfb8 100644
break;
}
}
-diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
-index cf5d513..cf424e6 100644
---- a/modules/proxy/mod_proxy_ftp.c
-+++ b/modules/proxy/mod_proxy_ftp.c
-@@ -275,8 +275,7 @@ static apr_status_t ftp_string_read(conn_rec *c, apr_bucket_brigade *bb,
+--- apache2.orig/modules/proxy/mod_proxy_ftp.c
++++ apache2/modules/proxy/mod_proxy_ftp.c
+@@ -275,8 +275,7 @@ static apr_status_t ftp_string_read(conn
pos += len;
}
}
@@ -9072,7 +9220,7 @@ index cf5d513..cf424e6 100644
}
*pos = '\0';
}
-@@ -448,7 +447,7 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
+@@ -448,7 +447,7 @@ static apr_status_t proxy_send_dir_filte
apr_bucket_brigade *out = apr_brigade_create(p, c->bucket_alloc);
apr_status_t rv;
@@ -9081,7 +9229,7 @@ index cf5d513..cf424e6 100644
char *dir, *path, *reldir, *site, *str, *type;
const char *pwd = apr_table_get(r->notes, "Directory-PWD");
-@@ -634,8 +633,7 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
+@@ -634,8 +633,7 @@ static apr_status_t proxy_send_dir_filte
/* len+1 to leave space for the trailing nil char */
apr_cpystrn(ctx->buffer+strlen(ctx->buffer), response, len+1);
@@ -9091,11 +9239,17 @@ index cf5d513..cf424e6 100644
}
/* EOS? jump to footer */
-diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
-index 141452b..b8f06c1 100644
---- a/modules/proxy/mod_proxy_http.c
-+++ b/modules/proxy/mod_proxy_http.c
-@@ -1011,8 +1011,11 @@ static request_rec *make_fake_req(conn_rec *c, request_rec *r)
+--- apache2.orig/modules/proxy/mod_proxy_http.c
++++ apache2/modules/proxy/mod_proxy_http.c
+@@ -687,7 +687,6 @@ static apr_status_t proxy_buckets_lifeti
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00964)
+ "Unhandled bucket type of type %s in"
+ " proxy_buckets_lifetime_transform", e->type->name);
+- apr_bucket_delete(e);
+ rv = APR_EGENERAL;
+ }
+ }
+@@ -1011,8 +1010,11 @@ static request_rec *make_fake_req(conn_r
rp->status = HTTP_OK;
rp->headers_in = apr_table_make(pool, 50);
@@ -9107,7 +9261,7 @@ index 141452b..b8f06c1 100644
rp->err_headers_out = apr_table_make(pool, 5);
rp->notes = apr_table_make(pool, 5);
-@@ -1093,6 +1096,7 @@ static void ap_proxy_read_headers(request_rec *r, request_rec *rr,
+@@ -1093,6 +1095,7 @@ static void ap_proxy_read_headers(reques
psc = (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
r->headers_out = apr_table_make(r->pool, 20);
@@ -9115,7 +9269,7 @@ index 141452b..b8f06c1 100644
*pread_len = 0;
/*
-@@ -1223,6 +1227,14 @@ apr_status_t ap_proxygetline(apr_bucket_brigade *bb, char *s, int n, request_rec
+@@ -1223,6 +1226,14 @@ apr_status_t ap_proxygetline(apr_bucket_
#define AP_MAX_INTERIM_RESPONSES 10
#endif
@@ -9130,7 +9284,7 @@ index 141452b..b8f06c1 100644
static
apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
proxy_conn_rec **backend_ptr,
-@@ -1640,6 +1652,18 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
+@@ -1640,6 +1651,18 @@ apr_status_t ap_proxy_http_process_respo
if (!r->header_only && /* not HEAD request */
(proxy_status != HTTP_NO_CONTENT) && /* not 204 */
(proxy_status != HTTP_NOT_MODIFIED)) { /* not 304 */
@@ -9149,7 +9303,7 @@ index 141452b..b8f06c1 100644
ap_discard_request_body(backend->r);
}
return proxy_status;
-@@ -1735,6 +1759,12 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
+@@ -1735,6 +1758,12 @@ apr_status_t ap_proxy_http_process_respo
/* next time try a non-blocking read */
mode = APR_NONBLOCK_READ;
@@ -9162,11 +9316,9 @@ index 141452b..b8f06c1 100644
apr_brigade_length(bb, 0, &readbytes);
backend->worker->s->read += readbytes;
#if DEBUGGING
-diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
-index a2172fe..c30c4aa 100644
---- a/modules/proxy/mod_proxy_wstunnel.c
-+++ b/modules/proxy/mod_proxy_wstunnel.c
-@@ -141,29 +141,6 @@ static int proxy_wstunnel_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o,
+--- apache2.orig/modules/proxy/mod_proxy_wstunnel.c
++++ apache2/modules/proxy/mod_proxy_wstunnel.c
+@@ -141,29 +141,6 @@ static int proxy_wstunnel_transfer(reque
return rv;
}
@@ -9196,7 +9348,16 @@ index a2172fe..c30c4aa 100644
/*
* process the request and write the response.
*/
-@@ -236,7 +213,7 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
+@@ -174,7 +151,7 @@ static int ap_proxy_wstunnel_request(apr
+ apr_uri_t *uri,
+ char *url, char *server_portstr)
+ {
+- apr_status_t rv = APR_SUCCESS;
++ apr_status_t rv;
+ apr_pollset_t *pollset;
+ apr_pollfd_t pollfd;
+ const apr_pollfd_t *signalled;
+@@ -236,7 +213,7 @@ static int ap_proxy_wstunnel_request(apr
pollfd.desc.s = client_socket;
apr_pollset_add(pollset, &pollfd);
@@ -9205,11 +9366,9 @@ index a2172fe..c30c4aa 100644
r->output_filters = c->output_filters;
r->proto_output_filters = c->output_filters;
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index ef2185d..3c2440c 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -1542,7 +1542,7 @@ apr_status_t ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p)
+--- apache2.orig/modules/ssl/ssl_engine_init.c
++++ apache2/modules/ssl/ssl_engine_init.c
+@@ -1542,7 +1542,7 @@ apr_status_t ssl_init_CheckServers(serve
klen = strlen(key);
if ((ps = (server_rec *)apr_hash_get(table, key, klen))) {
@@ -9218,11 +9377,9 @@ index ef2185d..3c2440c 100644
"Init: SSL server IP/port conflict: "
"%s (%s:%d) vs. %s (%s:%d)",
ssl_util_vhostid(p, s),
-diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
-index 922bf7c..97ff211 100644
---- a/modules/ssl/ssl_engine_vars.c
-+++ b/modules/ssl/ssl_engine_vars.c
-@@ -261,7 +261,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
+--- apache2.orig/modules/ssl/ssl_engine_vars.c
++++ apache2/modules/ssl/ssl_engine_vars.c
+@@ -261,7 +261,7 @@ char *ssl_var_lookup(apr_pool_t *p, serv
else if (strcEQ(var, "SERVER_SOFTWARE"))
result = ap_get_server_banner();
else if (strcEQ(var, "API_VERSION")) {
@@ -9231,10 +9388,8 @@ index 922bf7c..97ff211 100644
resdup = FALSE;
}
else if (strcEQ(var, "TIME_YEAR")) {
-diff --git a/os/bs2000/os.c b/os/bs2000/os.c
-index 9dc776d..199706f 100644
---- a/os/bs2000/os.c
-+++ b/os/bs2000/os.c
+--- apache2.orig/os/bs2000/os.c
++++ apache2/os/bs2000/os.c
@@ -114,8 +114,8 @@ pid_t os_fork(const char *user)
pid = ufork(username);
@@ -9246,10 +9401,8 @@ index 9dc776d..199706f 100644
"for user %s - Aborting.", user);
exit(1);
}
-diff --git a/os/unix/unixd.c b/os/unix/unixd.c
-index c10ea9d..bcb97a5 100644
---- a/os/unix/unixd.c
-+++ b/os/unix/unixd.c
+--- apache2.orig/os/unix/unixd.c
++++ apache2/os/unix/unixd.c
@@ -522,8 +522,8 @@ pid_t os_fork(const char *user)
pid = ufork(username);
@@ -9261,11 +9414,9 @@ index c10ea9d..bcb97a5 100644
"for user %s - Aborting.", user);
exit(1);
}
-diff --git a/server/config.c b/server/config.c
-index 9961358..dada063 100644
---- a/server/config.c
-+++ b/server/config.c
-@@ -1607,11 +1607,7 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
+--- apache2.orig/server/config.c
++++ apache2/server/config.c
+@@ -1607,11 +1607,7 @@ AP_DECLARE(const char *) ap_soak_end_con
while((rc = ap_varbuf_cfg_getline(&vb, cmd->config_file, max_len))
== APR_SUCCESS) {
@@ -9277,11 +9428,9 @@ index 9961358..dada063 100644
cmd_name = ap_getword_conf(cmd->temp_pool, &args);
if (cmd_name[0] == '<') {
-diff --git a/server/core.c b/server/core.c
-index dd1a375..613ffa4 100644
---- a/server/core.c
-+++ b/server/core.c
-@@ -520,6 +520,10 @@ static void *merge_core_server_configs(apr_pool_t *p, void *basev, void *virtv)
+--- apache2.orig/server/core.c
++++ apache2/server/core.c
+@@ -520,6 +520,10 @@ static void *merge_core_server_configs(a
if (virt->error_log_req)
conf->error_log_req = virt->error_log_req;
@@ -9292,7 +9441,7 @@ index dd1a375..613ffa4 100644
return conf;
}
-@@ -3882,6 +3886,16 @@ AP_DECLARE(void) ap_register_errorlog_handler(apr_pool_t *p, char *tag,
+@@ -3882,6 +3886,16 @@ AP_DECLARE(void) ap_register_errorlog_ha
}
@@ -9309,7 +9458,7 @@ index dd1a375..613ffa4 100644
/* Note --- ErrorDocument will now work from .htaccess files.
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
-@@ -4129,6 +4143,8 @@ AP_INIT_TAKE1("EnableExceptionHook", ap_mpm_set_exception_hook, NULL, RSRC_CONF,
+@@ -4129,6 +4143,8 @@ AP_INIT_TAKE1("EnableExceptionHook", ap_
#endif
AP_INIT_TAKE1("TraceEnable", set_trace_enable, NULL, RSRC_CONF,
"'on' (default), 'off' or 'extended' to trace request body content"),
@@ -9318,7 +9467,7 @@ index dd1a375..613ffa4 100644
{ NULL }
};
-@@ -4211,7 +4227,6 @@ static int core_map_to_storage(request_rec *r)
+@@ -4211,7 +4227,6 @@ static int core_map_to_storage(request_r
static int do_nothing(request_rec *r) { return OK; }
@@ -9326,11 +9475,9 @@ index dd1a375..613ffa4 100644
static int core_override_type(request_rec *r)
{
core_dir_config *conf =
-diff --git a/server/core_filters.c b/server/core_filters.c
-index 84e1149..8700b76 100644
---- a/server/core_filters.c
-+++ b/server/core_filters.c
-@@ -718,8 +718,7 @@ static void remove_empty_buckets(apr_bucket_brigade *bb)
+--- apache2.orig/server/core_filters.c
++++ apache2/server/core_filters.c
+@@ -718,8 +718,7 @@ static void remove_empty_buckets(apr_buc
apr_bucket *bucket;
while (((bucket = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) &&
(APR_BUCKET_IS_METADATA(bucket) || (bucket->length == 0))) {
@@ -9340,7 +9487,7 @@ index 84e1149..8700b76 100644
}
}
-@@ -792,19 +791,16 @@ static apr_status_t writev_nonblocking(apr_socket_t *s,
+@@ -792,19 +791,16 @@ static apr_status_t writev_nonblocking(a
for (i = offset; i < nvec; ) {
apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
if (APR_BUCKET_IS_METADATA(bucket)) {
@@ -9363,7 +9510,7 @@ index 84e1149..8700b76 100644
vec[i].iov_len -= n;
vec[i].iov_base = (char *) vec[i].iov_base + n;
break;
-@@ -883,12 +879,10 @@ static apr_status_t sendfile_nonblocking(apr_socket_t *s,
+@@ -883,12 +879,10 @@ static apr_status_t sendfile_nonblocking
*cumulative_bytes_written += bytes_written;
if ((bytes_written < file_length) && (bytes_written > 0)) {
apr_bucket_split(bucket, bytes_written);
@@ -9378,11 +9525,9 @@ index 84e1149..8700b76 100644
}
return rv;
}
-diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
-index 6b049c9..821f69d 100644
---- a/server/mpm/netware/mpm_netware.c
-+++ b/server/mpm/netware/mpm_netware.c
-@@ -1043,7 +1043,7 @@ static int netware_check_config(apr_pool_t *p, apr_pool_t *plog,
+--- apache2.orig/server/mpm/netware/mpm_netware.c
++++ apache2/server/mpm/netware/mpm_netware.c
+@@ -1043,7 +1043,7 @@ static int netware_check_config(apr_pool
APLOGNO(00230) "WARNING: MaxThreads of %d not allowed, "
"increasing to 1.", ap_threads_limit);
} else {
@@ -9391,11 +9536,9 @@ index 6b049c9..821f69d 100644
"MaxThreads of %d not allowed, increasing to 1",
ap_threads_limit);
}
-diff --git a/server/mpm_unix.c b/server/mpm_unix.c
-index 0000cb6..1a7f935 100644
---- a/server/mpm_unix.c
-+++ b/server/mpm_unix.c
-@@ -579,7 +579,7 @@ static apr_status_t podx_signal_internal(ap_pod_t *pod,
+--- apache2.orig/server/mpm_unix.c
++++ apache2/server/mpm_unix.c
+@@ -579,7 +579,7 @@ static apr_status_t podx_signal_internal
rv = apr_file_write(pod->pod_out, &char_of_death, &one);
if (rv != APR_SUCCESS) {
@@ -9404,11 +9547,9 @@ index 0000cb6..1a7f935 100644
"write pipe_of_death");
}
return rv;
-diff --git a/server/protocol.c b/server/protocol.c
-index bf915a0..47af714 100644
---- a/server/protocol.c
-+++ b/server/protocol.c
-@@ -718,6 +718,8 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb
+--- apache2.orig/server/protocol.c
++++ apache2/server/protocol.c
+@@ -718,6 +718,8 @@ AP_DECLARE(void) ap_get_mime_headers_cor
r->status = HTTP_REQUEST_TIME_OUT;
}
else {
@@ -9417,7 +9558,7 @@ index bf915a0..47af714 100644
r->status = HTTP_BAD_REQUEST;
}
-@@ -917,9 +919,11 @@ request_rec *ap_read_request(conn_rec *conn)
+@@ -917,9 +919,11 @@ request_rec *ap_read_request(conn_rec *c
r->allowed_methods = ap_make_method_list(p, 2);
r->headers_in = apr_table_make(r->pool, 25);
@@ -9429,7 +9570,7 @@ index bf915a0..47af714 100644
r->notes = apr_table_make(r->pool, 5);
r->request_config = ap_create_request_config(r->pool);
-@@ -1185,6 +1189,7 @@ AP_DECLARE(void) ap_set_sub_req_protocol(request_rec *rnew,
+@@ -1185,6 +1189,7 @@ AP_DECLARE(void) ap_set_sub_req_protocol
rnew->status = HTTP_OK;
rnew->headers_in = apr_table_copy(rnew->pool, r->headers_in);
@@ -9437,7 +9578,7 @@ index bf915a0..47af714 100644
/* did the original request have a body? (e.g. POST w/SSI tags)
* if so, make sure the subrequest doesn't inherit body headers
-@@ -1196,6 +1201,7 @@ AP_DECLARE(void) ap_set_sub_req_protocol(request_rec *rnew,
+@@ -1196,6 +1201,7 @@ AP_DECLARE(void) ap_set_sub_req_protocol
rnew->subprocess_env = apr_table_copy(rnew->pool, r->subprocess_env);
rnew->headers_out = apr_table_make(rnew->pool, 5);
rnew->err_headers_out = apr_table_make(rnew->pool, 5);
@@ -9445,7 +9586,7 @@ index bf915a0..47af714 100644
rnew->notes = apr_table_make(rnew->pool, 5);
rnew->expecting_100 = r->expecting_100;
-@@ -1250,8 +1256,8 @@ AP_DECLARE(void) ap_note_auth_failure(request_rec *r)
+@@ -1250,8 +1256,8 @@ AP_DECLARE(void) ap_note_auth_failure(re
ap_run_note_auth_failure(r, type);
}
else {
@@ -9456,7 +9597,7 @@ index bf915a0..47af714 100644
}
}
-@@ -1277,8 +1283,8 @@ AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
+@@ -1277,8 +1283,8 @@ AP_DECLARE(int) ap_get_basic_auth_pw(req
return DECLINED;
if (!ap_auth_name(r)) {
@@ -9467,11 +9608,9 @@ index bf915a0..47af714 100644
return HTTP_INTERNAL_SERVER_ERROR;
}
-diff --git a/server/util.c b/server/util.c
-index 2b60300..cd2aa82 100644
---- a/server/util.c
-+++ b/server/util.c
-@@ -252,7 +252,7 @@ AP_DECLARE(int) ap_os_is_path_absolute(apr_pool_t *p, const char *dir)
+--- apache2.orig/server/util.c
++++ apache2/server/util.c
+@@ -252,7 +252,7 @@ AP_DECLARE(int) ap_os_is_path_absolute(a
AP_DECLARE(int) ap_is_matchexp(const char *str)
{
@@ -9480,7 +9619,7 @@ index 2b60300..cd2aa82 100644
for (x = 0; str[x]; x++)
if ((str[x] == '*') || (str[x] == '?'))
-@@ -528,7 +528,7 @@ AP_DECLARE(void) ap_getparents(char *name)
+@@ -528,7 +528,7 @@ AP_DECLARE(void) ap_getparents(char *nam
while (name[l] != '\0') {
if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2])
&& (l == 0 || IS_SLASH(name[l - 1]))) {
@@ -9489,7 +9628,7 @@ index 2b60300..cd2aa82 100644
l = l - 2;
if (l >= 0) {
-@@ -654,7 +654,7 @@ AP_DECLARE(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s)
+@@ -654,7 +654,7 @@ AP_DECLARE(char *) ap_make_dirstr_parent
AP_DECLARE(int) ap_count_dirs(const char *path)
{
@@ -9498,7 +9637,7 @@ index 2b60300..cd2aa82 100644
for (x = 0, n = 0; path[x]; x++)
if (path[x] == '/')
-@@ -1585,7 +1585,7 @@ AP_DECLARE(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *str)
+@@ -1585,7 +1585,7 @@ AP_DECLARE(char *) ap_escape_shell_cmd(a
static char x2c(const char *what)
{
@@ -9516,7 +9655,7 @@ index 2b60300..cd2aa82 100644
char *x, *y;
badesc = 0;
-@@ -2100,11 +2100,11 @@ AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
+@@ -2100,11 +2100,11 @@ AP_DECLARE(char *) ap_make_full_path(apr
*/
AP_DECLARE(int) ap_is_url(const char *u)
{
@@ -9530,11 +9669,21 @@ index 2b60300..cd2aa82 100644
(u[x] != '+') && (u[x] != '-') && (u[x] != '.'))) {
return 0;
}
-diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
-index 529736b..0c4ba1f 100644
---- a/server/util_expr_eval.c
-+++ b/server/util_expr_eval.c
-@@ -1475,7 +1475,7 @@ static const char *misc_var_fn(ap_expr_eval_ctx_t *ctx, const void *data)
+--- apache2.orig/server/util_expr_eval.c
++++ apache2/server/util_expr_eval.c
+@@ -236,10 +236,8 @@ static int ap_expr_eval_comp(ap_expr_eva
+ do {
+ const ap_expr_t *val = e2->node_arg1;
+ AP_DEBUG_ASSERT(e2->node_op == op_ListElement);
+- if (strcmp(needle, ap_expr_eval_word(ctx, val)) == 0) {
++ if (strcmp(needle, ap_expr_eval_word(ctx, val)) == 0)
+ return 1;
+- break;
+- }
+ e2 = e2->node_arg2;
+ } while (e2 != NULL);
+ }
+@@ -1475,7 +1473,7 @@ static const char *misc_var_fn(ap_expr_e
case 8:
return ap_get_server_banner();
case 9:
@@ -9543,11 +9692,9 @@ index 529736b..0c4ba1f 100644
default:
ap_assert(0);
}
-diff --git a/server/util_fcgi.c b/server/util_fcgi.c
-index 450f300..a241e96 100644
---- a/server/util_fcgi.c
-+++ b/server/util_fcgi.c
-@@ -278,8 +278,8 @@ AP_DECLARE(apr_status_t) ap_fcgi_encode_env(request_rec *r,
+--- apache2.orig/server/util_fcgi.c
++++ apache2/server/util_fcgi.c
+@@ -278,8 +278,8 @@ AP_DECLARE(apr_status_t) ap_fcgi_encode_
}
if (rv != APR_SUCCESS) {
@@ -9558,11 +9705,9 @@ index 450f300..a241e96 100644
"encoding environment");
}
-diff --git a/server/util_script.c b/server/util_script.c
-index 3bc1b00..87504fa 100644
---- a/server/util_script.c
-+++ b/server/util_script.c
-@@ -543,7 +543,8 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer,
+--- apache2.orig/server/util_script.c
++++ apache2/server/util_script.c
+@@ -543,7 +543,8 @@ AP_DECLARE(int) ap_scan_script_header_er
}
if (maybeASCII > maybeEBCDIC) {
ap_log_error(SCRIPT_LOG_MARK, APLOG_ERR, 0, r->server,
@@ -9572,7 +9717,7 @@ index 3bc1b00..87504fa 100644
r->filename);
inbytes_left = outbytes_left = cp - w;
apr_xlate_conv_buffer(ap_hdrs_from_ascii,
-@@ -704,8 +705,7 @@ static int getsfunc_BRIGADE(char *buf, int len, void *arg)
+@@ -704,8 +705,7 @@ static int getsfunc_BRIGADE(char *buf, i
apr_bucket_split(e, src - bucket_data);
}
next = APR_BUCKET_NEXT(e);
@@ -9582,11 +9727,9 @@ index 3bc1b00..87504fa 100644
e = next;
}
*dst = 0;
-diff --git a/support/htdigest.c b/support/htdigest.c
-index f76036d..972fa82 100644
---- a/support/htdigest.c
-+++ b/support/htdigest.c
-@@ -92,7 +92,7 @@ static void getword(char *word, char *line, char stop)
+--- apache2.orig/support/htdigest.c
++++ apache2/support/htdigest.c
+@@ -92,7 +92,7 @@ static void getword(char *word, char *li
static int get_line(char *s, int n, apr_file_t *f)
{
@@ -9595,3 +9738,1787 @@ index f76036d..972fa82 100644
char ch;
apr_status_t rv = APR_EINVAL;
+--- apache2.orig/docs/man/tr/rotatelogs.8
++++ apache2/docs/man/tr/rotatelogs.8
+@@ -19,7 +19,7 @@
+ .el .ne 3
+ .IP "\\$1" \\$2
+ ..
+-.TH "ROTATELOGS" 8 "2014-06-24" "Apache HTTP Sunucusu" "rotatelogs"
++.TH "ROTATELOGS" 8 "2014-10-06" "Apache HTTP Sunucusu" "rotatelogs"
+ .nh
+ .SH İSİM
+ rotatelogs \- Apache günlüklerini döndürmek için borulu günlük kayıt programı
+@@ -68,7 +68,7 @@ Create log file for each interval, even
+ Zaman damgalarına bakılmaksızın bir dosya serisi açılır\&. Örneğin -n3 belirtilirse "logfile", "logfile\&.1", "logfile\&.2" serisi açılır ve "logfile" üzerine yazılır\&. 2\&.4\&.5 ve sonraki sürümler içindir\&.
+ .TP
+ \fIdosyaismi\fR
+-.PP Günlük dosyasının ismi yoluyla birlikte belirtilir\&. \fIdosyaismi\fR '%' karakterleri içeriyorsa bunlar strftime(3) biçem belirteçleri olarak ele alınır\&. Aksi takdirde, özdevinimli olarak \fI\&.nnnnnnnnnn\fR uzantısı üretilir\&. (\fB-t\fR seçeneği kullanılmadıkça) Uzantı saniye cinsindendir ve her iki durumda da bu değer, mevcut döngü diliminin başlangıcına göre hesaplanır\&. Örneğin, döndürmenin 86400 saniyede bir yapılacağı belirtilmişse, strftime(3) biçeminde oluşturulan saat, [...]
++.PP Günlük dosyasının ismi yoluyla birlikte belirtilir\&. \fIdosyaismi\fR '%' karakterleri içeriyorsa bunlar strftime(3) biçem belirteçleri olarak ele alınır\&. Aksi takdirde, özdevinimli olarak \fI\&.nnnnnnnnnn\fR uzantısı üretilir\&. (\fB-t\fR seçeneği kullanılmadıkça) Uzantı saniye cinsindendir ve her iki durumda da bu değer, mevcut döngü diliminin başlangıcına göre hesaplanır\&. Örneğin, döndürmenin 86400 saniyede bir yapılacağı belirtilmişse, strftime(3) biçeminde oluşturulan saat, [...]
+ .TP
+ \fIsüre\fR
+ Günlük dosyasının yenisinin kaç saniyede bir açılacağı belirtilir\&. Örneğin, bu süre 3600 saniye ise günlük dosyası her saat başında yenilenir; 86400 saniye ise her geceyarısı yenilenir\&. (Bu süre zarfında günlüğe kaydedilecek bir olay gerçekleşmemişse dosya oluşturulmaz\&.)
+@@ -83,25 +83,25 @@ Koordinatlı evrensel zamana göre "daki
+
+ .nf
+
+- CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common
++ CustomLog "|bin/rotatelogs /var/log/logfile 86400" common
+
+ .fi
+
+ .PP
+-nnnn, günlük kaydının başladığı sistem zamanı olmak üzere /var/logs/logfile\&.nnnn dosyası oluşturulur\&. Bu zaman, daima döngü süresinin katları olacağından bunu cron betiklerinizi eşzamanlamakta kullanabilirsiniz\&. Her döngü süresinin sonunda (burada 24 saat sonra) yeni bir günlük dosyası açılır\&.
++nnnn, günlük kaydının başladığı sistem zamanı olmak üzere /var/log/logfile\&.nnnn dosyası oluşturulur\&. Bu zaman, daima döngü süresinin katları olacağından bunu cron betiklerinizi eşzamanlamakta kullanabilirsiniz\&. Her döngü süresinin sonunda (burada 24 saat sonra) yeni bir günlük dosyası açılır\&.
+
+ .nf
+
+- CustomLog "|bin/rotatelogs -l /var/logs/logfile\&.%Y\&.%m\&.%d 86400" common
++ CustomLog "|bin/rotatelogs -l /var/log/logfile\&.%Y\&.%m\&.%d 86400" common
+
+ .fi
+
+ .PP
+-yyyy, yıl; mm, ay; dd, ayın gününü belirtmek üzere /var/logs/logfile\&.yyyy\&.mm\&.dd dosyası oluşturulur\&. Her gün yerel zamanla geceyarısı yeni bir günlük dosyasına geçilecektir\&.
++yyyy, yıl; mm, ay; dd, ayın gününü belirtmek üzere /var/log/logfile\&.yyyy\&.mm\&.dd dosyası oluşturulur\&. Her gün yerel zamanla geceyarısı yeni bir günlük dosyasına geçilecektir\&.
+
+ .nf
+
+- CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
++ CustomLog "|bin/rotatelogs /var/log/logfile 5M" common
+
+ .fi
+
+@@ -110,7 +110,7 @@ Günlük dosyası 5 megabaytlık olunca
+
+ .nf
+
+- ErrorLog "|bin/rotatelogs /var/logs/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
++ ErrorLog "|bin/rotatelogs /var/log/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
+
+ .fi
+
+@@ -119,12 +119,12 @@ Hata günlüğünün 5 megabaytta bir er
+
+ .nf
+
+- CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common
++ CustomLog "|bin/rotatelogs -t /var/log/logfile 86400" common
+
+ .fi
+
+ .PP
+-/var/logs/logfile dosyasını oluşturur, sunucu başlatılırken ve günde bir kere dosyanın tepesi kırpılır\&. Bu senaryoda ayrı bir sürecin (tail gibi) dosyayı gerçek zamanlı işleyeceği umulur\&.
++/var/log/logfile dosyasını oluşturur, sunucu başlatılırken ve günde bir kere dosyanın tepesi kırpılır\&. Bu senaryoda ayrı bir sürecin (tail gibi) dosyayı gerçek zamanlı işleyeceği umulur\&.
+
+ .SH "TAŞINABİLİRLİK"
+
+--- apache2.orig/docs/manual/logs.html.en
++++ apache2/docs/manual/logs.html.en
+@@ -617,7 +617,7 @@ CustomLog logs/access_log comonvhost</pr
+
+
+ <p>The <code>%v</code> is used to log the name of the virtual
+- host that is serving the request. Then a program like <a href="programs/other.html">split-logfile</a> can be used to
++ host that is serving the request. Then a program like <a href="programs/split-logfile.html">split-logfile</a> can be used to
+ post-process the access log in order to split it into one file
+ per virtual host.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+--- apache2.orig/docs/manual/logs.html.fr
++++ apache2/docs/manual/logs.html.fr
+@@ -664,7 +664,7 @@ CustomLog logs/access_log comonvhost</pr
+
+
+ <p>Le champ <code>%v</code> sert � enregistrer le nom de l'h�te virtuel qui
+- traite la requ�te. Un programme tel que <a href="programs/other.html">split-logfile</a> peut ensuite �tre utilis�
++ traite la requ�te. Un programme tel que <a href="programs/split-logfile.html">split-logfile</a> peut ensuite �tre utilis�
+ pour g�n�rer "� froid" autant de journaux que d'h�tes virtuels.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+ <div class="section">
+--- apache2.orig/docs/manual/logs.html.tr.utf8
++++ apache2/docs/manual/logs.html.tr.utf8
+@@ -584,7 +584,7 @@ CustomLog logs/access_log ortaksankon</p
+
+
+ <p><code>%v</code> belirteci isteği sunan sanal konağın ismini günlüğe
+- yazmak için kullanılır. Daha sonra <a href="programs/other.html">split-logfile</a> gibi bir program
++ yazmak için kullanılır. Daha sonra <a href="programs/split-logfile.html">split-logfile</a> gibi bir program
+ kullanarak, bu dosyadan her sanal konak için ayrı birer dosya elde
+ edilebilir.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+--- apache2.orig/docs/manual/mod/index.html.de
++++ apache2/docs/manual/mod/index.html.de
+@@ -133,7 +133,7 @@ client</dd>
+ modules</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+ SSI pages</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+ <code>Cache-Control</code> HTTP headers according to user-specified
+ criteria</dd>
+--- apache2.orig/docs/manual/mod/index.html.en
++++ apache2/docs/manual/mod/index.html.en
+@@ -129,7 +129,7 @@ client</dd>
+ modules</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+ SSI pages</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+ <code>Cache-Control</code> HTTP headers according to user-specified
+ criteria</dd>
+--- apache2.orig/docs/manual/mod/index.html.es
++++ apache2/docs/manual/mod/index.html.es
+@@ -134,7 +134,7 @@ client</dd>
+ modules</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+ SSI pages</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+ <code>Cache-Control</code> HTTP headers according to user-specified
+ criteria</dd>
+--- apache2.orig/docs/manual/mod/index.html.fr
++++ apache2/docs/manual/mod/index.html.fr
+@@ -148,7 +148,7 @@ erreurs de la mani�re souhait�e.</dd>
+ protocole</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>Modifie l'environnement transmis aux scripts CGI et aux
+ pages SSI</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustration de l'API des modules Apache</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustration de l'API des modules Apache</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>G�n�ration des en-t�tes HTTP <code>Expires</code> et
+ <code>Cache-Control</code> en fonction de crit�res sp�cifi�s par
+ l'utilisateur</dd>
+--- apache2.orig/docs/manual/mod/index.html.ja.utf8
++++ apache2/docs/manual/mod/index.html.ja.utf8
+@@ -125,7 +125,7 @@ HTTP caching filter.</dd>
+ </dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>CGI スクリプト及び SSI
+ ページに渡される環境変数を変更する機能を提供する</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>ユーザの指定した基準に基づいた <code>Expires</code> と
+ <code>Cache-Control</code> HTTP ヘッダの生成</dd>
+ <dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>レスポンスのボディをクライアントに送る前に外部プログラムで処理する</dd>
+--- apache2.orig/docs/manual/mod/index.html.ko.euc-kr
++++ apache2/docs/manual/mod/index.html.ko.euc-kr
+@@ -122,7 +122,7 @@ index ������ �����Ѵ�</dd>
+ <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>�������� ����� �����ϱ����� ������ echo ����</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>CGI ��ũ��Ʈ�� SSI �������� ������ ȯ�溯����
+ �����Ѵ�</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>����ġ ��� API�� �����Ѵ�</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>����ġ ��� API�� �����Ѵ�</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>����ڰ� ������ ���ؿ� ���� <code>Expires</code>��
+ <code>Cache-Control</code> HTTP ����� �����Ѵ�</dd>
+ <dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>���� ������ �ܺ� ���α����� ó���� �� Ŭ���̾�Ʈ��
+--- apache2.orig/docs/manual/mod/index.html.tr.utf8
++++ apache2/docs/manual/mod/index.html.tr.utf8
+@@ -123,7 +123,7 @@ client</dd>
+ modules</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>CGI betiklerine ve SSI sayfalarına aktarılan değişkenlere müdahale
+ etmek için kullanılır.</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+ <code>Cache-Control</code> HTTP headers according to user-specified
+ criteria</dd>
+--- apache2.orig/docs/manual/mod/index.html.zh-cn.utf8
++++ apache2/docs/manual/mod/index.html.zh-cn.utf8
+@@ -124,7 +124,7 @@ client</dd>
+ modules</dd>
+ <dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+ SSI pages</dd>
+-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
++<dt><a href="mod_example_hooks.html">mod_example_hooks</a></dt><dd>Illustrates the Apache module API</dd>
+ <dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+ <code>Cache-Control</code> HTTP headers according to user-specified
+ criteria</dd>
+--- apache2.orig/docs/manual/mod/mod_dav.html.en
++++ apache2/docs/manual/mod/mod_dav.html.en
+@@ -162,7 +162,7 @@
+ <pre class="prettyprint lang-config">Alias /phparea /home/gstein/php_files
+ Alias /php-source /home/gstein/php_files
+ <Location /php-source>
+- DAV On
++ Dav On
+ ForceType text/plain
+ </Location></pre>
+
+--- apache2.orig/docs/manual/mod/mod_dav.html.fr
++++ apache2/docs/manual/mod/mod_dav.html.fr
+@@ -174,7 +174,7 @@ documents via le web (<a href="http://ww
+ <pre class="prettyprint lang-config">Alias /phparea /home/gstein/php_files
+ Alias /php-source /home/gstein/php_files
+ <Location /php-source>
+-DAV On
++Dav On
+ ForceType text/plain
+ </Location></pre>
+
+--- apache2.orig/docs/manual/mod/mod_dav.html.ja.utf8
++++ apache2/docs/manual/mod/mod_dav.html.ja.utf8
+@@ -162,7 +162,7 @@
+ <pre class="prettyprint lang-config">Alias /phparea /home/gstein/php_files
+ Alias /php-source /home/gstein/php_files
+ <Location /php-source>
+- DAV On
++ Dav On
+ ForceType text/plain
+ </Location></pre>
+
+--- apache2.orig/docs/manual/mod/mod_example.html
++++ apache2/docs/manual/mod/mod_example.html
+@@ -1,13 +0,0 @@
+-# GENERATED FROM XML -- DO NOT EDIT
+-
+-URI: mod_example.html.en
+-Content-Language: en
+-Content-type: text/html; charset=ISO-8859-1
+-
+-URI: mod_example.html.fr
+-Content-Language: fr
+-Content-type: text/html; charset=ISO-8859-1
+-
+-URI: mod_example.html.ko.euc-kr
+-Content-Language: ko
+-Content-type: text/html; charset=EUC-KR
+--- apache2.orig/docs/manual/mod/mod_example.html.en
++++ apache2/docs/manual/mod/mod_example.html.en
+@@ -1,180 +0,0 @@
+-<?xml version="1.0" encoding="ISO-8859-1"?>
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- This file is generated from xml source: DO NOT EDIT
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- -->
+-<title>mod_example - Apache HTTP Server Version 2.4</title>
+-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
+-<script src="../style/scripts/prettify.min.js" type="text/javascript">
+-</script>
+-
+-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+-<body>
+-<div id="page-header">
+-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+-<p class="apache">Apache HTTP Server Version 2.4</p>
+-<img alt="" src="../images/feather.gif" /></div>
+-<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+-<div id="path">
+-<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Modules</a></div>
+-<div id="page-content">
+-<div id="preamble"><h1>Apache Module mod_example</h1>
+-<div class="toplang">
+-<p><span>Available Languages: </span><a href="../en/mod/mod_example.html" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" hreflang="fr" rel="alternate" title="Fran�ais"> fr </a> |
+-<a href="../ko/mod/mod_example.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
+-</div>
+-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Illustrates the Apache module API</td></tr>
+-<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+-<tr><th><a href="module-dict.html#ModuleIdentifier">Module�Identifier:</a></th><td>example_module</td></tr>
+-<tr><th><a href="module-dict.html#SourceFile">Source�File:</a></th><td>mod_example.c</td></tr></table>
+-<h3>Summary</h3>
+-
+- <p>Some files in the <code>modules/experimental</code> directory
+- under the Apache distribution directory tree are provided as an
+- example to those that wish to write modules that use the Apache
+- API.</p>
+-
+- <p>The main file is <code>mod_example.c</code>, which
+- illustrates all the different callback mechanisms and call
+- syntaxes. By no means does an add-on module need to include
+- routines for all of the callbacks - quite the contrary!</p>
+-
+- <p>The example module is an actual working module. If you link
+- it into your server, enable the "example-handler" handler for a
+- location, and then browse to that location, you will see a
+- display of some of the tracing the example module did as the
+- various callbacks were made.</p>
+-</div>
+-<div id="quickview"><h3 class="directives">Directives</h3>
+-<ul id="toc">
+-<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
+-</ul>
+-<h3>Topics</h3>
+-<ul id="topics">
+-<li><img alt="" src="../images/down.gif" /> <a href="#compiling">Compiling the example module</a></li>
+-<li><img alt="" src="../images/down.gif" /> <a href="#using">Using the <code>mod_example</code> Module</a></li>
+-</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="compiling" id="compiling">Compiling the example module</a></h2>
+-
+- <p>To include the example module in your server, follow the
+- steps below:</p>
+-
+- <ol>
+- <li>
+- Run <code class="program"><a href="../programs/configure.html">configure</a></code> with <code>--enable-example</code>
+- option.</li>
+-
+- <li>Make the server (run "<code>make</code>").</li>
+- </ol>
+-
+- <p>To add another module of your own:</p>
+-
+- <ol class="up-A">
+- <li><code>cp modules/experimental/mod_example.c
+- modules/new_module/<em>mod_myexample.c</em></code></li>
+-
+- <li>Modify the file.</li>
+-
+- <li>Create <code>modules/new_module/config.m4</code>.
+- <ol>
+- <li>Add <code>APACHE_MODPATH_INIT(new_module)</code>.</li>
+- <li>Copy APACHE_MODULE line with "example" from
+- <code>modules/experimental/config.m4</code>.</li>
+- <li>Replace the first argument "example" with <em>myexample</em>.</li>
+- <li>Replace the second argument with brief description of your module.
+- It will be used in <code>configure --help</code>.</li>
+- <li>If your module needs additional C compiler flags, linker flags or
+- libraries, add them to CFLAGS, LDFLAGS and LIBS accordingly.
+- See other <code>config.m4</code> files in modules directory for
+- examples.</li>
+- <li>Add <code>APACHE_MODPATH_FINISH</code>.</li>
+- </ol>
+- </li>
+-
+- <li>Create <code>module/new_module/Makefile.in</code>.
+- If your module doesn't need special build instructions,
+- all you need to have in that file is
+- <code>include $(top_srcdir)/build/special.mk</code>.</li>
+-
+- <li>Run ./buildconf from the top-level directory.</li>
+-
+- <li>Build the server with --enable-myexample</li>
+-
+- </ol>
+-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="using" id="using">Using the <code>mod_example</code> Module</a></h2>
+-
+- <p>To activate the example module, include a block similar to
+- the following in your <code>httpd.conf</code> file:</p>
+-<pre class="prettyprint lang-config"><Location /example-info>
+- SetHandler example-handler
+-</Location></pre>
+-
+-
+- <p>As an alternative, you can put the following into a <a href="core.html#accessfilename"><code>.htaccess</code></a> file
+- and then request the file "test.example" from that location:</p>
+-<pre class="prettyprint lang-config">AddHandler example-handler .example</pre>
+-
+-
+- <p>After reloading/restarting your server, you should be able
+- to browse to this location and see the brief display mentioned
+- earlier.</p>
+-</div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
+-<table class="directive">
+-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Demonstration directive to illustrate the Apache module
+-API</td></tr>
+-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Example</code></td></tr>
+-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example</td></tr>
+-</table>
+- <p>The <code class="directive">Example</code> directive just sets a demonstration
+- flag which the example module's content handler displays. It
+- takes no arguments. If you browse to an URL to which the
+- example content-handler applies, you will get a display of the
+- routines within the module and how and in what order they were
+- called to service the document request. The effect of this
+- directive one can observe under the point "<code>Example
+- directive declared here: YES/NO</code>".</p>
+-
+-</div>
+-</div>
+-<div class="bottomlang">
+-<p><span>Available Languages: </span><a href="../en/mod/mod_example.html" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" hreflang="fr" rel="alternate" title="Fran�ais"> fr </a> |
+-<a href="../ko/mod/mod_example.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
+-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on h [...]
+-<script type="text/javascript"><!--//--><![CDATA[//><!--
+-var comments_shortname = 'httpd';
+-var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example.html';
+-(function(w, d) {
+- if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
+- d.write('<div id="comments_thread"><\/div>');
+- var s = d.createElement('script');
+- s.type = 'text/javascript';
+- s.async = true;
+- s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
+- (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+- }
+- else {
+- d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
+- }
+-})(window, document);
+-//--><!]]></script></div><div id="footer">
+-<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
+-if (typeof(prettyPrint) !== 'undefined') {
+- prettyPrint();
+-}
+-//--><!]]></script>
+-</body></html>
+\ No newline at end of file
+--- apache2.orig/docs/manual/mod/mod_example.html.fr
++++ apache2/docs/manual/mod/mod_example.html.fr
+@@ -1,192 +0,0 @@
+-<?xml version="1.0" encoding="ISO-8859-1"?>
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr"><head><!--
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- This file is generated from xml source: DO NOT EDIT
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- -->
+-<title>mod_example - Serveur Apache HTTP Version 2.4</title>
+-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
+-<script src="../style/scripts/prettify.min.js" type="text/javascript">
+-</script>
+-
+-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+-<body>
+-<div id="page-header">
+-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p>
+-<p class="apache">Serveur Apache HTTP Version 2.4</p>
+-<img alt="" src="../images/feather.gif" /></div>
+-<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+-<div id="path">
+-<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">Serveur HTTP</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Modules</a></div>
+-<div id="page-content">
+-<div id="preamble"><h1>Module Apache mod_example</h1>
+-<div class="toplang">
+-<p><span>Langues Disponibles: </span><a href="../en/mod/mod_example.html" hreflang="en" rel="alternate" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" title="Fran�ais"> fr </a> |
+-<a href="../ko/mod/mod_example.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
+-</div>
+-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Illustration de l'API des modules Apache</td></tr>
+-<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+-<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur�de�Module:</a></th><td>example_module</td></tr>
+-<tr><th><a href="module-dict.html#SourceFile">Fichier�Source:</a></th><td>mod_example.c</td></tr></table>
+-<h3>Sommaire</h3>
+-
+- <p>Certains fichiers situ�s dans le r�pertoire
+- <code>modules/experimental</code> de l'arborescence de la
+- distribution d'Apache sont fournis � titre d'exemples pour ceux qui
+- souhaitent �crire des modules qui utilisent l'API d'Apache.</p>
+-
+- <p>Le fichier principal est <code>mod_example.c</code>, qui
+- constitue une illustration exhaustive des diff�rents m�canismes et
+- syntaxes d'appels. En aucun cas un module additionnel n'aura �
+- inclure des routines pour tous les appels - il n'en n�cessitera au
+- contraire qu'un petit nombre !</p>
+-
+- <p>Le module example fonctionne r�ellement. Si vous le chargez dans
+- votre serveur, activez le gestionnaire "example-handler" dans une
+- section location, et essayez d'acc�der � la zone du site web
+- correspondante, vous verrez s'afficher certaines sorties que le
+- module example produit au cours des diff�rents appels.</p>
+-</div>
+-<div id="quickview"><h3 class="directives">Directives</h3>
+-<ul id="toc">
+-<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
+-</ul>
+-<h3>Sujets</h3>
+-<ul id="topics">
+-<li><img alt="" src="../images/down.gif" /> <a href="#compiling">Compilation du module example</a></li>
+-<li><img alt="" src="../images/down.gif" /> <a href="#using">Utilisation du module
+-<code>mod_example</code></a></li>
+-</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="compiling" id="compiling">Compilation du module example</a></h2>
+-
+- <p>Pour inclure le module example dans votre serveur, effectuez les
+- �tapes suivantes :</p>
+-
+- <ol>
+- <li>Ex�cutez <code class="program"><a href="../programs/configure.html">configure</a></code> avec l'option
+- <code>--enable-example</code>.</li>
+-
+- <li>Compilez le serveur (ex�cutez la commande
+- "<code>make</code>").</li>
+- </ol>
+-
+- <p>Pour ajouter votre propre module :</p>
+-
+- <ol class="up-A">
+- <li><code>cp modules/experimental/mod_example.c
+- modules/nouveau_module/<em>mod_monexemple.c</em></code></li>
+-
+- <li>Modifiez le fichier.</li>
+-
+- <li>Cr�ez <code>modules/nouveau_module/config.m4</code>.
+- <ol>
+- <li>Ajoutez <code>APACHE_MODPATH_INIT(nouveau_module)</code>.</li>
+- <li>Copiez la ligne APACHE_MODULE contenant "example" depuis
+- <code>modules/experimental/config.m4</code>.</li>
+- <li>Remplacez le premier argument "example" par
+- <em>monexemple</em>.</li>
+- <li>Remplacez le second argument par une br�ve description de
+- votre module. Cette description sera utilis�e par la commande
+- <code>configure --help</code>.</li>
+- <li>Si la compilation de votre module n�cessite des drapeaux
+- de compilation C, des drapeaux d'�dition de liens, ou de
+- biblioth�ques suppl�mentaires, ajoutez les respectivement �
+- CFLAGS, LDFLAGS et LIBS. Reportez-vous aux fichiers
+- <code>config.m4</code> des r�pertoires des autres modules pour
+- plus d'exemples.</li>
+- <li>Ajoutez <code>APACHE_MODPATH_FINISH</code>.</li>
+- </ol>
+- </li>
+-
+- <li>Cr�ez le fichier
+- <code>module/nouveau_module/Makefile.in</code>.
+- Si la compilation de votre module ne n�cessite pas d'instructions
+- particuli�res, ce fichier ne doit contenir que la ligne
+- <code>include $(top_srcdir)/build/special.mk</code>.</li>
+-
+- <li>Ex�cutez ./buildconf � la racine du r�pertoire.</li>
+-
+- <li>Compilez le serveur apr�s avoir ex�cut� la commande configure
+- avec l'option --enable-monexemple.</li>
+-
+- </ol>
+-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="using" id="using">Utilisation du module
+-<code>mod_example</code></a></h2>
+-
+- <p>Pour activer le module example, ajoutez � votre fichier
+- <code>httpd.conf</code> un bloc du style :</p>
+-<pre class="prettyprint lang-config"><Location /example-info>
+- SetHandler example-handler
+-</Location></pre>
+-
+-
+- <p>Vous pouvez aussi ajouter ce qui suit dans un fichier <a href="core.html#accessfilename"><code>.htaccess</code></a>, puis
+- acc�der au fichier "test.example" � partir du r�pertoire
+- correspondant :</p>
+-
+-<pre class="prettyprint lang-config">AddHandler example-handler .example</pre>
+-
+-
+- <p>Apr�s avoir recharg� la configuration ou red�marr� votre serveur,
+- vous devriez pouvoir acc�der � ce fichier et voir s'afficher ce qui
+- a �t� d�crit plus haut.</p>
+-</div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
+-<table class="directive">
+-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directive de d�monstration pour illustrer l'API des modules
+-Apache</td></tr>
+-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Example</code></td></tr>
+-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example</td></tr>
+-</table>
+- <p>La directive <code class="directive">Example</code> n'a pour fonction que
+- de d�finir un drapeau de d�monstration que le gestionnaire de
+- contenu du module example va afficher. Elle ne poss�de aucun
+- argument. Si vous naviguez vers une URL � laquelle le gestionnaire
+- de contenu example s'applique, vous verrez s'afficher les routines
+- du module, ainsi que l'ordre dans lequel elles ont �t� appel�es pour
+- servir le document demand�. On peut observer l'effet de cette
+- directive dans la phrase "<code>Example
+- directive declared here: YES/NO</code>".</p>
+-
+-</div>
+-</div>
+-<div class="bottomlang">
+-<p><span>Langues Disponibles: </span><a href="../en/mod/mod_example.html" hreflang="en" rel="alternate" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" title="Fran�ais"> fr </a> |
+-<a href="../ko/mod/mod_example.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
+-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Commentaires</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions [...]
+-<script type="text/javascript"><!--//--><![CDATA[//><!--
+-var comments_shortname = 'httpd';
+-var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example.html';
+-(function(w, d) {
+- if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
+- d.write('<div id="comments_thread"><\/div>');
+- var s = d.createElement('script');
+- s.type = 'text/javascript';
+- s.async = true;
+- s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
+- (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+- }
+- else {
+- d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
+- }
+-})(window, document);
+-//--><!]]></script></div><div id="footer">
+-<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Autoris� sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
+-if (typeof(prettyPrint) !== 'undefined') {
+- prettyPrint();
+-}
+-//--><!]]></script>
+-</body></html>
+\ No newline at end of file
+--- apache2.orig/docs/manual/mod/mod_example.html.ko.euc-kr
++++ apache2/docs/manual/mod/mod_example.html.ko.euc-kr
+@@ -1,181 +0,0 @@
+-<?xml version="1.0" encoding="EUC-KR"?>
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"><head><!--
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- This file is generated from xml source: DO NOT EDIT
+- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+- -->
+-<title>mod_example - Apache HTTP Server Version 2.4</title>
+-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
+-<script src="../style/scripts/prettify.min.js" type="text/javascript">
+-</script>
+-
+-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+-<body>
+-<div id="page-header">
+-<p class="menu"><a href="../mod/">���</a> | <a href="../mod/directives.html">���þ��</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">���</a> | <a href="../sitemap.html">����Ʈ��</a></p>
+-<p class="apache">Apache HTTP Server Version 2.4</p>
+-<img alt="" src="../images/feather.gif" /></div>
+-<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+-<div id="path">
+-<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">���</a></div>
+-<div id="page-content">
+-<div id="preamble"><h1>����ġ ��� mod_example</h1>
+-<div class="toplang">
+-<p><span>������ ���: </span><a href="../en/mod/mod_example.html" hreflang="en" rel="alternate" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
+-<a href="../ko/mod/mod_example.html" title="Korean"> ko </a></p>
+-</div>
+-<div class="outofdate">�� ������ �ֽ��� ������ �ƴմϴ�.
+- �ֱٿ� ����� ������ ���� ������ �����ϼ���.</div>
+-<table class="module"><tr><th><a href="module-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����Ѵ�</td></tr>
+-<tr><th><a href="module-dict.html#Status">����:</a></th><td>Experimental</td></tr>
+-<tr><th><a href="module-dict.html#ModuleIdentifier">����:</a></th><td>example_module</td></tr>
+-<tr><th><a href="module-dict.html#SourceFile">�ҽ�����:</a></th><td>mod_example.c</td></tr></table>
+-<h3>���</h3>
+-
+- <p>����ġ ������ <code>modules/experimental</code> ���丮��
+- �ִ� ���ϵ��� ����ġ API�� ����Ͽ� ����� �ۼ��Ϸ��� �������
+- �������� ������.</p>
+-
+- <p><code>mod_example.c</code>�� ��� �ݹ�(callback) ������
+- ȣ�� ������ �����ϴ� �����̴�. ����� �� �� ��� �ݹ���
+- ������ �ʿ䰡 ����. ��� ���ݴ��!</p>
+-
+- <p>example ����� ������ �����ϴ� ����̴�. �� ����� ������
+- �����ϰ� Ư�� ��ġ�� "example-handler" �ڵ鷯�� �Ҵ��Ͽ�
+- �װ��� ����¡�ϸ� example ����� ���� �ݹ��� Ȯ���� ��
+- �ִ�.</p>
+-</div>
+-<div id="quickview"><h3 class="directives">���þ��</h3>
+-<ul id="toc">
+-<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
+-</ul>
+-<h3>����</h3>
+-<ul id="topics">
+-<li><img alt="" src="../images/down.gif" /> <a href="#compiling">example ��� �������ϱ�</a></li>
+-<li><img alt="" src="../images/down.gif" /> <a href="#using"><code>mod_example</code> ��� ����ϱ�</a></li>
+-</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="compiling" id="compiling">example ��� �������ϱ�</a></h2>
+-
+- <p>������ example ����� �����Ϸ��� ���� ������ ��ģ��:</p>
+-
+- <ol>
+- <li>
+- <code>--enable-example</code> �ɼǰ� �Բ�
+- <code>configure</code>�� �����Ѵ�.</li>
+-
+- <li>������ �������Ѵ� ("<code>make</code>"�� �����Ѵ�).</li>
+- </ol>
+-
+- <p>�ڽ��� ���� ����� �߰��Ϸ���:</p>
+-
+- <ol class="up-A">
+- <li><code>cp modules/experimental/mod_example.c
+- modules/new_module/<em>mod_myexample.c</em></code></li>
+-
+- <li>������ �����Ѵ�.</li>
+-
+- <li><code>modules/new_module/config.m4</code> ������ �����.
+- <ol>
+- <li><code>APACHE_MODPATH_INIT(new_module)</code>��
+- �߰��Ѵ�.</li>
+- <li><code>modules/experimental/config.m4</code> ���Ͽ���
+- "example"�� �ִ� APACHE_MODULE ���� �����ؿ´�.</li>
+- <li>ù��° �ƱԸ�Ʈ "example"�� <em>myexample</em>��
+- �����Ѵ�.</li>
+- <li>�ι�° �ƱԸ�Ʈ �ڸ��� �ڽ��� ���� �� ����
+- ������ ������ ���´�. <code>configure --help</code>��
+- �����ϸ� ��� ����� ������ �����ش�.</li>
+- <li>����� �������Ҷ� Ư���� C �����Ϸ� �ɼ�, ��Ŀ
+- �ɼ�, ���̺귯���� �ʿ��ϸ� ���� CFLAGS, LDFLAGS,
+- LIBS�� �߰��Ѵ�. modules ���丮�� �ִ� �ٸ�
+- <code>config.m4</code> ���ϵ��� �����϶�.</li>
+- <li><code>APACHE_MODPATH_FINISH</code>�� �߰��Ѵ�.</li>
+- </ol>
+- </li>
+-
+- <li><code>module/new_module/Makefile.in</code> ������
+- �����. ����� �������ϴµ� Ư���� ��ɾ �ʿ���ٸ�,
+- ���Ͽ� <code>include $(top_srcdir)/build/special.mk</code>��
+- �־ �ȴ�.</li>
+-
+- <li>�ֻ��� ���丮���� ./buildconf �� �����Ѵ�.</li>
+-
+- <li>--enable-myexample �ɼ��� ����Ͽ� ������ �������Ѵ�</li>
+-
+- </ol>
+-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="section">
+-<h2><a name="using" id="using"><code>mod_example</code> ��� ����ϱ�</a></h2>
+-
+- <p>example ����� ����Ϸ��� <code>httpd.conf</code> ���Ͽ�
+- ������ ���� ������ �߰��϶�:</p>
+-<div class="example"><p><code>
+- <Location /example-info><br />
+- SetHandler example-handler<br />
+- </Location>
+-</code></p></div>
+-
+- <p>�ƴϸ� <a href="core.html#accessfilename"><code>.htaccess</code></a>
+- ���Ͽ� ������ ���� ������ �߰��ϰ�, �� ��ġ���� "test.example"
+- ���� ������ ��û�϶�:</p>
+-<div class="example"><p><code>
+- AddHandler example-handler .example
+-</code></p></div>
+-
+- <p>������ ������� �� �� ��ġ�� ����¡�ϸ� �տ��� ����
+- ������ ���Ե� ���̴�.</p>
+-</div>
+-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+-<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">���þ�</a></h2>
+-<table class="directive">
+-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
+-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Example</code></td></tr>
+-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory, .htaccess</td></tr>
+-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
+-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_example</td></tr>
+-</table>
+- <p><code class="directive">Example</code> ���þ�� example �����
+- �����ڵ鷯�� ������ ������ ������ ���θ� �����Ѵ�. �� ���þ��
+- �ƱԸ�Ʈ�� �����ʴ´�. example �����ڵ鷯�� ������ URL��
+- �����ϸ� ���� ��û�� �����ϱ����� ���ȿ� �Լ����� ���
+- ���� � ������ �Ҹ����� �� �� �ִ�. �� ���þ��� ȿ����
+- "<code>Example directive declared here: YES/NO</code>"��
+- Ȯ���� �� �ִ�.</p>
+-
+-</div>
+-</div>
+-<div class="bottomlang">
+-<p><span>������ ���: </span><a href="../en/mod/mod_example.html" hreflang="en" rel="alternate" title="English"> en </a> |
+-<a href="../fr/mod/mod_example.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
+-<a href="../ko/mod/mod_example.html" title="Korean"> ko </a></p>
+-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on h [...]
+-<script type="text/javascript"><!--//--><![CDATA[//><!--
+-var comments_shortname = 'httpd';
+-var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example.html';
+-(function(w, d) {
+- if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
+- d.write('<div id="comments_thread"><\/div>');
+- var s = d.createElement('script');
+- s.type = 'text/javascript';
+- s.async = true;
+- s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
+- (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+- }
+- else {
+- d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
+- }
+-})(window, document);
+-//--><!]]></script></div><div id="footer">
+-<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+-<p class="menu"><a href="../mod/">���</a> | <a href="../mod/directives.html">���þ��</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">���</a> | <a href="../sitemap.html">����Ʈ��</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
+-if (typeof(prettyPrint) !== 'undefined') {
+- prettyPrint();
+-}
+-//--><!]]></script>
+-</body></html>
+\ No newline at end of file
+--- /dev/null
++++ apache2/docs/manual/mod/mod_example_hooks.html
+@@ -0,0 +1,13 @@
++# GENERATED FROM XML -- DO NOT EDIT
++
++URI: mod_example_hooks.html.en
++Content-Language: en
++Content-type: text/html; charset=ISO-8859-1
++
++URI: mod_example_hooks.html.fr
++Content-Language: fr
++Content-type: text/html; charset=ISO-8859-1
++
++URI: mod_example_hooks.html.ko.euc-kr
++Content-Language: ko
++Content-type: text/html; charset=EUC-KR
+--- /dev/null
++++ apache2/docs/manual/mod/mod_example_hooks.html.en
+@@ -0,0 +1,180 @@
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ This file is generated from xml source: DO NOT EDIT
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ -->
++<title>mod_example_hooks - Apache HTTP Server Version 2.4</title>
++<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
++<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
++<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
++<script src="../style/scripts/prettify.min.js" type="text/javascript">
++</script>
++
++<link href="../images/favicon.ico" rel="shortcut icon" /></head>
++<body>
++<div id="page-header">
++<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
++<p class="apache">Apache HTTP Server Version 2.4</p>
++<img alt="" src="../images/feather.gif" /></div>
++<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
++<div id="path">
++<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Modules</a></div>
++<div id="page-content">
++<div id="preamble"><h1>Apache Module mod_example_hooks</h1>
++<div class="toplang">
++<p><span>Available Languages: </span><a href="../en/mod/mod_example_hooks.html" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" hreflang="fr" rel="alternate" title="Fran�ais"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
++</div>
++<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Illustrates the Apache module API</td></tr>
++<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
++<tr><th><a href="module-dict.html#ModuleIdentifier">Module�Identifier:</a></th><td>example_hooks_module</td></tr>
++<tr><th><a href="module-dict.html#SourceFile">Source�File:</a></th><td>mod_example_hooks.c</td></tr></table>
++<h3>Summary</h3>
++
++ <p>The files in the <code>modules/examples</code> directory
++ under the Apache distribution directory tree are provided as an
++ example to those that wish to write modules that use the Apache
++ API.</p>
++
++ <p>The main file is <code>mod_example_hooks.c</code>, which
++ illustrates all the different callback mechanisms and call
++ syntaxes. By no means does an add-on module need to include
++ routines for all of the callbacks - quite the contrary!</p>
++
++ <p>The example module is an actual working module. If you link
++ it into your server, enable the "example-hooks-handler" handler for a
++ location, and then browse to that location, you will see a
++ display of some of the tracing the example module did as the
++ various callbacks were made.</p>
++</div>
++<div id="quickview"><h3 class="directives">Directives</h3>
++<ul id="toc">
++<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
++</ul>
++<h3>Topics</h3>
++<ul id="topics">
++<li><img alt="" src="../images/down.gif" /> <a href="#compiling">Compiling the example_hooks module</a></li>
++<li><img alt="" src="../images/down.gif" /> <a href="#using">Using the <code>mod_example_hooks</code> Module</a></li>
++</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="compiling" id="compiling">Compiling the example_hooks module</a></h2>
++
++ <p>To include the example_hooks module in your server, follow the
++ steps below:</p>
++
++ <ol>
++ <li>
++ Run <code class="program"><a href="../programs/configure.html">configure</a></code> with <code>--enable-example-hooks</code>
++ option.</li>
++
++ <li>Make the server (run "<code>make</code>").</li>
++ </ol>
++
++ <p>To add another module of your own:</p>
++
++ <ol class="up-A">
++ <li><code>cp modules/examples/mod_example_hooks.c
++ modules/new_module/<em>mod_myexample.c</em></code></li>
++
++ <li>Modify the file.</li>
++
++ <li>Create <code>modules/new_module/config.m4</code>.
++ <ol>
++ <li>Add <code>APACHE_MODPATH_INIT(new_module)</code>.</li>
++ <li>Copy APACHE_MODULE line with "example_hooks" from
++ <code>modules/examples/config.m4</code>.</li>
++ <li>Replace the first argument "example_hooks" with <em>myexample</em>.</li>
++ <li>Replace the second argument with brief description of your module.
++ It will be used in <code>configure --help</code>.</li>
++ <li>If your module needs additional C compiler flags, linker flags or
++ libraries, add them to CFLAGS, LDFLAGS and LIBS accordingly.
++ See other <code>config.m4</code> files in modules directory for
++ examples.</li>
++ <li>Add <code>APACHE_MODPATH_FINISH</code>.</li>
++ </ol>
++ </li>
++
++ <li>Create <code>module/new_module/Makefile.in</code>.
++ If your module doesn't need special build instructions,
++ all you need to have in that file is
++ <code>include $(top_srcdir)/build/special.mk</code>.</li>
++
++ <li>Run ./buildconf from the top-level directory.</li>
++
++ <li>Build the server with --enable-myexample</li>
++
++ </ol>
++</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="using" id="using">Using the <code>mod_example_hooks</code> Module</a></h2>
++
++ <p>To activate the example_hooks module, include a block similar to
++ the following in your <code>httpd.conf</code> file:</p>
++<pre class="prettyprint lang-config"><Location /example-hooks-info>
++ SetHandler example-hooks-handler
++</Location></pre>
++
++
++ <p>As an alternative, you can put the following into a <a href="core.html#accessfilename"><code>.htaccess</code></a> file
++ and then request the file "test.example" from that location:</p>
++<pre class="prettyprint lang-config">AddHandler example-hooks-handler .example</pre>
++
++
++ <p>After reloading/restarting your server, you should be able
++ to browse to this location and see the brief display mentioned
++ earlier.</p>
++</div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
++<table class="directive">
++<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Demonstration directive to illustrate the Apache module
++API</td></tr>
++<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Example</code></td></tr>
++<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
++<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
++<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
++</table>
++ <p>The <code class="directive">Example</code> directive just sets a demonstration
++ flag which the example module's content handler displays. It
++ takes no arguments. If you browse to an URL to which the
++ example-hooks content-handler applies, you will get a display of the
++ routines within the module and how and in what order they were
++ called to service the document request. The effect of this
++ directive one can observe under the point "<code>Example
++ directive declared here: YES/NO</code>".</p>
++
++</div>
++</div>
++<div class="bottomlang">
++<p><span>Available Languages: </span><a href="../en/mod/mod_example_hooks.html" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" hreflang="fr" rel="alternate" title="Fran�ais"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
++</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on h [...]
++<script type="text/javascript"><!--//--><![CDATA[//><!--
++var comments_shortname = 'httpd';
++var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example_hooks.html';
++(function(w, d) {
++ if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
++ d.write('<div id="comments_thread"><\/div>');
++ var s = d.createElement('script');
++ s.type = 'text/javascript';
++ s.async = true;
++ s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
++ (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
++ }
++ else {
++ d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
++ }
++})(window, document);
++//--><!]]></script></div><div id="footer">
++<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
++<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
++if (typeof(prettyPrint) !== 'undefined') {
++ prettyPrint();
++}
++//--><!]]></script>
++</body></html>
+\ No newline at end of file
+--- /dev/null
++++ apache2/docs/manual/mod/mod_example_hooks.html.fr
+@@ -0,0 +1,192 @@
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr"><head><!--
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ This file is generated from xml source: DO NOT EDIT
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ -->
++<title>mod_example_hooks - Serveur Apache HTTP Version 2.4</title>
++<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
++<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
++<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
++<script src="../style/scripts/prettify.min.js" type="text/javascript">
++</script>
++
++<link href="../images/favicon.ico" rel="shortcut icon" /></head>
++<body>
++<div id="page-header">
++<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p>
++<p class="apache">Serveur Apache HTTP Version 2.4</p>
++<img alt="" src="../images/feather.gif" /></div>
++<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
++<div id="path">
++<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">Serveur HTTP</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Modules</a></div>
++<div id="page-content">
++<div id="preamble"><h1>Module Apache mod_example_hooks</h1>
++<div class="toplang">
++<p><span>Langues Disponibles: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" title="Fran�ais"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
++</div>
++<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Illustration de l'API des modules Apache</td></tr>
++<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
++<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur�de�Module:</a></th><td>example_hooks_module</td></tr>
++<tr><th><a href="module-dict.html#SourceFile">Fichier�Source:</a></th><td>mod_example_hooks.c</td></tr></table>
++<h3>Sommaire</h3>
++
++ <p>Certains fichiers situ�s dans le r�pertoire
++ <code>modules/examples</code> de l'arborescence de la
++ distribution d'Apache sont fournis � titre d'exemples pour ceux qui
++ souhaitent �crire des modules qui utilisent l'API d'Apache.</p>
++
++ <p>Le fichier principal est <code>mod_example_hooks.c</code>, qui
++ constitue une illustration exhaustive des diff�rents m�canismes et
++ syntaxes d'appels. En aucun cas un module additionnel n'aura �
++ inclure des routines pour tous les appels - il n'en n�cessitera au
++ contraire qu'un petit nombre !</p>
++
++ <p>Le module example_hooks fonctionne r�ellement. Si vous le chargez dans
++ votre serveur, activez le gestionnaire "example-hooks-handler" dans une
++ section location, et essayez d'acc�der � la zone du site web
++ correspondante, vous verrez s'afficher certaines sorties que le
++ module example_hooks produit au cours des diff�rents appels.</p>
++</div>
++<div id="quickview"><h3 class="directives">Directives</h3>
++<ul id="toc">
++<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
++</ul>
++<h3>Sujets</h3>
++<ul id="topics">
++<li><img alt="" src="../images/down.gif" /> <a href="#compiling">Compilation du module example_hooks</a></li>
++<li><img alt="" src="../images/down.gif" /> <a href="#using">Utilisation du module
++<code>mod_example_hooks</code></a></li>
++</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="compiling" id="compiling">Compilation du module example_hooks</a></h2>
++
++ <p>Pour inclure le module example_hooks dans votre serveur, effectuez les
++ �tapes suivantes :</p>
++
++ <ol>
++ <li>Ex�cutez <code class="program"><a href="../programs/configure.html">configure</a></code> avec l'option
++ <code>--enable-example-hooks</code>.</li>
++
++ <li>Compilez le serveur (ex�cutez la commande
++ "<code>make</code>").</li>
++ </ol>
++
++ <p>Pour ajouter votre propre module :</p>
++
++ <ol class="up-A">
++ <li><code>cp modules/examples/mod_example_hooks.c
++ modules/nouveau_module/<em>mod_monexemple.c</em></code></li>
++
++ <li>Modifiez le fichier.</li>
++
++ <li>Cr�ez <code>modules/nouveau_module/config.m4</code>.
++ <ol>
++ <li>Ajoutez <code>APACHE_MODPATH_INIT(nouveau_module)</code>.</li>
++ <li>Copiez la ligne APACHE_MODULE contenant "example_hooks" depuis
++ <code>modules/examples/config.m4</code>.</li>
++ <li>Remplacez le premier argument "example-hooks" par
++ <em>monexemple</em>.</li>
++ <li>Remplacez le second argument par une br�ve description de
++ votre module. Cette description sera utilis�e par la commande
++ <code>configure --help</code>.</li>
++ <li>Si la compilation de votre module n�cessite des drapeaux
++ de compilation C, des drapeaux d'�dition de liens, ou de
++ biblioth�ques suppl�mentaires, ajoutez les respectivement �
++ CFLAGS, LDFLAGS et LIBS. Reportez-vous aux fichiers
++ <code>config.m4</code> des r�pertoires des autres modules pour
++ plus d'exemples.</li>
++ <li>Ajoutez <code>APACHE_MODPATH_FINISH</code>.</li>
++ </ol>
++ </li>
++
++ <li>Cr�ez le fichier
++ <code>module/nouveau_module/Makefile.in</code>.
++ Si la compilation de votre module ne n�cessite pas d'instructions
++ particuli�res, ce fichier ne doit contenir que la ligne
++ <code>include $(top_srcdir)/build/special.mk</code>.</li>
++
++ <li>Ex�cutez ./buildconf � la racine du r�pertoire.</li>
++
++ <li>Compilez le serveur apr�s avoir ex�cut� la commande configure
++ avec l'option --enable-monexemple.</li>
++
++ </ol>
++</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="using" id="using">Utilisation du module
++<code>mod_example_hooks</code></a></h2>
++
++ <p>Pour activer le module example_hooks, ajoutez � votre fichier
++ <code>httpd.conf</code> un bloc du style :</p>
++<pre class="prettyprint lang-config"><Location /example-hooks-info>
++ SetHandler example-hooks-handler
++</Location></pre>
++
++
++ <p>Vous pouvez aussi ajouter ce qui suit dans un fichier <a href="core.html#accessfilename"><code>.htaccess</code></a>, puis
++ acc�der au fichier "test.example" � partir du r�pertoire
++ correspondant :</p>
++
++<pre class="prettyprint lang-config">AddHandler example-hooks-handler .example</pre>
++
++
++ <p>Apr�s avoir recharg� la configuration ou red�marr� votre serveur,
++ vous devriez pouvoir acc�der � ce fichier et voir s'afficher ce qui
++ a �t� d�crit plus haut.</p>
++</div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
++<table class="directive">
++<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directive de d�monstration pour illustrer l'API des modules
++Apache</td></tr>
++<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Example</code></td></tr>
++<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
++<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
++<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
++</table>
++ <p>La directive <code class="directive">Example</code> n'a pour fonction que
++ de d�finir un drapeau de d�monstration que le gestionnaire de
++ contenu du module example_hooks va afficher. Elle ne poss�de aucun
++ argument. Si vous naviguez vers une URL � laquelle le gestionnaire
++ de contenu example_hooks s'applique, vous verrez s'afficher les routines
++ du module, ainsi que l'ordre dans lequel elles ont �t� appel�es pour
++ servir le document demand�. On peut observer l'effet de cette
++ directive dans la phrase "<code>Example
++ directive declared here: YES/NO</code>".</p>
++
++</div>
++</div>
++<div class="bottomlang">
++<p><span>Langues Disponibles: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" title="Fran�ais"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
++</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Commentaires</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions [...]
++<script type="text/javascript"><!--//--><![CDATA[//><!--
++var comments_shortname = 'httpd';
++var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example_hooks.html';
++(function(w, d) {
++ if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
++ d.write('<div id="comments_thread"><\/div>');
++ var s = d.createElement('script');
++ s.type = 'text/javascript';
++ s.async = true;
++ s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
++ (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
++ }
++ else {
++ d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
++ }
++})(window, document);
++//--><!]]></script></div><div id="footer">
++<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Autoris� sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
++<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
++if (typeof(prettyPrint) !== 'undefined') {
++ prettyPrint();
++}
++//--><!]]></script>
++</body></html>
+\ No newline at end of file
+--- /dev/null
++++ apache2/docs/manual/mod/mod_example_hooks.html.ko.euc-kr
+@@ -0,0 +1,181 @@
++<?xml version="1.0" encoding="EUC-KR"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"><head><!--
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ This file is generated from xml source: DO NOT EDIT
++ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++ -->
++<title>mod_example_hooks - Apache HTTP Server Version 2.4</title>
++<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
++<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
++<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
++<script src="../style/scripts/prettify.min.js" type="text/javascript">
++</script>
++
++<link href="../images/favicon.ico" rel="shortcut icon" /></head>
++<body>
++<div id="page-header">
++<p class="menu"><a href="../mod/">���</a> | <a href="../mod/directives.html">���þ��</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">���</a> | <a href="../sitemap.html">����Ʈ��</a></p>
++<p class="apache">Apache HTTP Server Version 2.4</p>
++<img alt="" src="../images/feather.gif" /></div>
++<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
++<div id="path">
++<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">���</a></div>
++<div id="page-content">
++<div id="preamble"><h1>����ġ ��� mod_example_hooks</h1>
++<div class="toplang">
++<p><span>������ ���: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" title="Korean"> ko </a></p>
++</div>
++<div class="outofdate">�� ������ �ֽ��� ������ �ƴմϴ�.
++ �ֱٿ� ����� ������ ���� ������ �����ϼ���.</div>
++<table class="module"><tr><th><a href="module-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����Ѵ�</td></tr>
++<tr><th><a href="module-dict.html#Status">����:</a></th><td>Experimental</td></tr>
++<tr><th><a href="module-dict.html#ModuleIdentifier">����:</a></th><td>example_hooks_module</td></tr>
++<tr><th><a href="module-dict.html#SourceFile">�ҽ�����:</a></th><td>mod_example_hooks.c</td></tr></table>
++<h3>���</h3>
++
++ <p>����ġ ������ <code>modules/examples</code> ���丮��
++ �ִ� ���ϵ��� ����ġ API�� ����Ͽ� ����� �ۼ��Ϸ��� �������
++ �������� ������.</p>
++
++ <p><code>mod_example_hooks.c</code>�� ��� �ݹ�(callback) ������
++ ȣ�� ������ �����ϴ� �����̴�. ����� �� �� ��� �ݹ���
++ ������ �ʿ䰡 ����. ��� ���ݴ��!</p>
++
++ <p>example ����� ������ �����ϴ� ����̴�. �� ����� ������
++ �����ϰ� Ư�� ��ġ�� "example-hooks-handler" �ڵ鷯�� �Ҵ��Ͽ�
++ �װ��� ����¡�ϸ� example ����� ���� �ݹ��� Ȯ���� ��
++ �ִ�.</p>
++</div>
++<div id="quickview"><h3 class="directives">���þ��</h3>
++<ul id="toc">
++<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
++</ul>
++<h3>����</h3>
++<ul id="topics">
++<li><img alt="" src="../images/down.gif" /> <a href="#compiling">example ��� �������ϱ�</a></li>
++<li><img alt="" src="../images/down.gif" /> <a href="#using"><code>mod_example_hooks</code> ��� ����ϱ�</a></li>
++</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="compiling" id="compiling">example ��� �������ϱ�</a></h2>
++
++ <p>������ example ����� �����Ϸ��� ���� ������ ��ģ��:</p>
++
++ <ol>
++ <li>
++ <code>--enable-example-hooks</code> �ɼǰ� �Բ�
++ <code>configure</code>�� �����Ѵ�.</li>
++
++ <li>������ �������Ѵ� ("<code>make</code>"�� �����Ѵ�).</li>
++ </ol>
++
++ <p>�ڽ��� ���� ����� �߰��Ϸ���:</p>
++
++ <ol class="up-A">
++ <li><code>cp modules/examples/mod_example_hooks.c
++ modules/new_module/<em>mod_myexample.c</em></code></li>
++
++ <li>������ �����Ѵ�.</li>
++
++ <li><code>modules/new_module/config.m4</code> ������ �����.
++ <ol>
++ <li><code>APACHE_MODPATH_INIT(new_module)</code>��
++ �߰��Ѵ�.</li>
++ <li><code>modules/examples/config.m4</code> ���Ͽ���
++ "example_hooks"�� �ִ� APACHE_MODULE ���� �����ؿ´�.</li>
++ <li>ù��° �ƱԸ�Ʈ "example_hooks"�� <em>myexample</em>��
++ �����Ѵ�.</li>
++ <li>�ι�° �ƱԸ�Ʈ �ڸ��� �ڽ��� ���� �� ����
++ ������ ������ ���´�. <code>configure --help</code>��
++ �����ϸ� ��� ����� ������ �����ش�.</li>
++ <li>����� �������Ҷ� Ư���� C �����Ϸ� �ɼ�, ��Ŀ
++ �ɼ�, ���̺귯���� �ʿ��ϸ� ���� CFLAGS, LDFLAGS,
++ LIBS�� �߰��Ѵ�. modules ���丮�� �ִ� �ٸ�
++ <code>config.m4</code> ���ϵ��� �����϶�.</li>
++ <li><code>APACHE_MODPATH_FINISH</code>�� �߰��Ѵ�.</li>
++ </ol>
++ </li>
++
++ <li><code>module/new_module/Makefile.in</code> ������
++ �����. ����� �������ϴµ� Ư���� ��ɾ �ʿ���ٸ�,
++ ���Ͽ� <code>include $(top_srcdir)/build/special.mk</code>��
++ �־ �ȴ�.</li>
++
++ <li>�ֻ��� ���丮���� ./buildconf �� �����Ѵ�.</li>
++
++ <li>--enable-myexample �ɼ��� ����Ͽ� ������ �������Ѵ�</li>
++
++ </ol>
++</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="section">
++<h2><a name="using" id="using"><code>mod_example_hooks</code> ��� ����ϱ�</a></h2>
++
++ <p>example ����� ����Ϸ��� <code>httpd.conf</code> ���Ͽ�
++ ������ ���� ������ �߰��϶�:</p>
++<div class="example"><p><code>
++ <Location /example-hooks-info><br />
++ SetHandler example-hooks-handler<br />
++ </Location>
++</code></p></div>
++
++ <p>�ƴϸ� <a href="core.html#accessfilename"><code>.htaccess</code></a>
++ ���Ͽ� ������ ���� ������ �߰��ϰ�, �� ��ġ���� "test.example"
++ ���� ������ ��û�϶�:</p>
++<div class="example"><p><code>
++ AddHandler example-hooks-handler .example
++</code></p></div>
++
++ <p>������ ������� �� �� ��ġ�� ����¡�ϸ� �տ��� ����
++ ������ ���Ե� ���̴�.</p>
++</div>
++<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
++<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">���þ�</a></h2>
++<table class="directive">
++<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
++<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Example</code></td></tr>
++<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory, .htaccess</td></tr>
++<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
++<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_example_hooks</td></tr>
++</table>
++ <p><code class="directive">Example</code> ���þ�� example �����
++ �����ڵ鷯�� ������ ������ ������ ���θ� �����Ѵ�. �� ���þ��
++ �ƱԸ�Ʈ�� �����ʴ´�. example �����ڵ鷯�� ������ URL��
++ �����ϸ� ���� ��û�� �����ϱ����� ���ȿ� �Լ����� ���
++ ���� � ������ �Ҹ����� �� �� �ִ�. �� ���þ��� ȿ����
++ "<code>Example directive declared here: YES/NO</code>"��
++ Ȯ���� �� �ִ�.</p>
++
++</div>
++</div>
++<div class="bottomlang">
++<p><span>������ ���: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English"> en </a> |
++<a href="../fr/mod/mod_example_hooks.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
++<a href="../ko/mod/mod_example_hooks.html" title="Korean"> ko </a></p>
++</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on h [...]
++<script type="text/javascript"><!--//--><![CDATA[//><!--
++var comments_shortname = 'httpd';
++var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_example_hooks.html';
++(function(w, d) {
++ if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
++ d.write('<div id="comments_thread"><\/div>');
++ var s = d.createElement('script');
++ s.type = 'text/javascript';
++ s.async = true;
++ s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
++ (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
++ }
++ else {
++ d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
++ }
++})(window, document);
++//--><!]]></script></div><div id="footer">
++<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
++<p class="menu"><a href="../mod/">���</a> | <a href="../mod/directives.html">���þ��</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">���</a> | <a href="../sitemap.html">����Ʈ��</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
++if (typeof(prettyPrint) !== 'undefined') {
++ prettyPrint();
++}
++//--><!]]></script>
++</body></html>
+\ No newline at end of file
+--- apache2.orig/docs/manual/sitemap.html.de
++++ apache2/docs/manual/sitemap.html.de
+@@ -230,7 +230,7 @@ HPUX betreiben</a></li>
+ <li><a href="mod/mod_dumpio.html">Apache-Modul mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Apache-Modul mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Apache-Modul mod_env</a></li>
+-<li><a href="mod/mod_example.html">Apache-Modul mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Apache-Modul mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Apache-Modul mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Apache-Modul mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Apache-Modul mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.en
++++ apache2/docs/manual/sitemap.html.en
+@@ -230,7 +230,7 @@ log_server_status</a></li>
+ <li><a href="mod/mod_dumpio.html">Apache Module mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Apache Module mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Apache Module mod_env</a></li>
+-<li><a href="mod/mod_example.html">Apache Module mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Apache Module mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Apache Module mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Apache Module mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Apache Module mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.es
++++ apache2/docs/manual/sitemap.html.es
+@@ -212,7 +212,7 @@ usados para describir las directivas de
+ <li><a href="mod/mod_dumpio.html">M�dulo Apache mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">M�dulo Apache mod_echo</a></li>
+ <li><a href="mod/mod_env.html">M�dulo Apache mod_env</a></li>
+-<li><a href="mod/mod_example.html">M�dulo Apache mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">M�dulo Apache mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">M�dulo Apache mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">M�dulo Apache mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">M�dulo Apache mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.fr
++++ apache2/docs/manual/sitemap.html.fr
+@@ -245,7 +245,7 @@ pour d�crire les directives Apache</a></
+ <li><a href="mod/mod_dumpio.html">Module Apache mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Module Apache mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Module Apache mod_env</a></li>
+-<li><a href="mod/mod_example.html">Module Apache mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Module Apache mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Module Apache mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Module Apache mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Module Apache mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.ja.utf8
++++ apache2/docs/manual/sitemap.html.ja.utf8
+@@ -211,7 +211,7 @@
+ <li><a href="mod/mod_dumpio.html">Apache モジュール mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Apache モジュール mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Apache モジュール mod_env</a></li>
+-<li><a href="mod/mod_example.html">Apache モジュール mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Apache モジュール mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Apache モジュール mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Apache モジュール mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Apache モジュール mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.ko.euc-kr
++++ apache2/docs/manual/sitemap.html.ko.euc-kr
+@@ -210,7 +210,7 @@
+ <li><a href="mod/mod_dumpio.html">����ġ ��� mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">����ġ ��� mod_echo</a></li>
+ <li><a href="mod/mod_env.html">����ġ ��� mod_env</a></li>
+-<li><a href="mod/mod_example.html">����ġ ��� mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">����ġ ��� mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">����ġ ��� mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">����ġ ��� mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">����ġ ��� mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.tr.utf8
++++ apache2/docs/manual/sitemap.html.tr.utf8
+@@ -225,7 +225,7 @@ Windows ile Apache Kullanımı</a></li>
+ <li><a href="mod/mod_dumpio.html">Apache Modülü mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Apache Modülü mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Apache Modülü mod_env</a></li>
+-<li><a href="mod/mod_example.html">Apache Modülü mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Apache Modülü mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Apache Modülü mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Apache Modülü mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Apache Modülü mod_file_cache</a></li>
+--- apache2.orig/docs/manual/sitemap.html.zh-cn.utf8
++++ apache2/docs/manual/sitemap.html.zh-cn.utf8
+@@ -211,7 +211,7 @@
+ <li><a href="mod/mod_dumpio.html">Apache 模块 mod_dumpio</a></li>
+ <li><a href="mod/mod_echo.html">Apache 模块 mod_echo</a></li>
+ <li><a href="mod/mod_env.html">Apache 模块 mod_env</a></li>
+-<li><a href="mod/mod_example.html">Apache 模块 mod_example</a></li>
++<li><a href="mod/mod_example_hooks.html">Apache 模块 mod_example_hooks</a></li>
+ <li><a href="mod/mod_expires.html">Apache 模块 mod_expires</a></li>
+ <li><a href="mod/mod_ext_filter.html">Apache 模块 mod_ext_filter</a></li>
+ <li><a href="mod/mod_file_cache.html">Apache 模块 mod_file_cache</a></li>
+--- apache2.orig/modules/cache/mod_cache.c
++++ apache2/modules/cache/mod_cache.c
+@@ -1201,6 +1201,8 @@ static apr_status_t cache_save_filter(ap
+ apr_table_unset(r->headers_in, "If-Range");
+ apr_table_unset(r->headers_in, "If-Unmodified-Since");
+
++ /* Currently HTTP_NOT_MODIFIED, and after the redirect, handlers won't think to set status to HTTP_OK */
++ r->status = HTTP_OK;
+ ap_internal_redirect(r->unparsed_uri, r);
+
+ return APR_SUCCESS;
+--- apache2.orig/modules/core/mod_macro.c
++++ apache2/modules/core/mod_macro.c
+@@ -115,17 +115,16 @@ static apr_array_header_t *get_arguments
+ /*
+ warn if anything non blank appears, but ignore comments...
+ */
+-static void warn_if_non_blank(
+- const char * what,
+- char * ptr,
+- ap_configfile_t * cfg)
++static void warn_if_non_blank(const char * what,
++ char * ptr,
++ ap_configfile_t * cfg)
+ {
+ char * p;
+ for (p=ptr; *p; p++) {
+ if (*p == '#')
+ break;
+ if (*p != ' ' && *p != '\t') {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
+ "%s on line %d of %s: %s",
+ what, cfg->line_number, cfg->name, ptr);
+ break;
+@@ -164,8 +163,8 @@ static char *get_lines_till_end_token(ap
+ if (!strncmp(first, "</", 2)) {
+ any_nesting--;
+ if (any_nesting < 0) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
+- 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING,
++ 0, NULL, APLOGNO(02793)
+ "bad (negative) nesting on line %d of %s",
+ config_file->line_number - line_number_start,
+ where);
+@@ -185,14 +184,14 @@ static char *get_lines_till_end_token(ap
+ }
+
+ warn_if_non_blank(
+- "non blank chars found after directive closing",
++ APLOGNO(02794) "non blank chars found after directive closing",
+ endp+1, config_file);
+
+ macro_nesting--;
+ if (!macro_nesting) {
+ if (any_nesting) {
+ ap_log_error(APLOG_MARK,
+- APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ APLOG_WARNING, 0, NULL, APLOGNO(02795)
+ "bad cumulated nesting (%+d) in %s",
+ any_nesting, where);
+ }
+@@ -257,7 +256,7 @@ static const char *check_macro_arguments
+ macro->name, macro->location, i + 1);
+ }
+ else if (!looks_like_an_argument(tab[i])) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02796)
+ "macro '%s' (%s) "
+ "argument name '%s' (#%d) without expected prefix, "
+ "better prefix argument names with one of '%s'.",
+@@ -271,7 +270,7 @@ static const char *check_macro_arguments
+ /* must not use the same argument name twice */
+ if (!strcmp(tab[i], tab[j])) {
+ return apr_psprintf(pool,
+- "argument name conflict in macro '%s' (%s): "
++ "argument name conflict in macro '%s' (%s): "
+ "argument '%s': #%d and #%d, "
+ "change argument names!",
+ macro->name, macro->location,
+@@ -281,11 +280,11 @@ static const char *check_macro_arguments
+ /* warn about common prefix, but only if non empty names */
+ if (ltabi && ltabj &&
+ !strncmp(tab[i], tab[j], ltabi < ltabj ? ltabi : ltabj)) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
+- 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING,
++ 0, NULL, APLOGNO(02797)
+ "macro '%s' (%s): "
+- "argument name prefix conflict (%s #%d and %s #%d),"
+- " be careful about your macro definition!",
++ "argument name prefix conflict (%s #%d and %s #%d), "
++ "be careful about your macro definition!",
+ macro->name, macro->location,
+ tab[i], i + 1, tab[j], j + 1);
+ }
+@@ -305,7 +304,7 @@ static void check_macro_use_arguments(co
+ int i;
+ for (i = 0; i < array->nelts; i++) {
+ if (empty_string_p(tab[i])) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02798)
+ "%s: empty argument #%d", where, i + 1);
+ }
+ }
+@@ -506,7 +505,7 @@ static const char *check_macro_contents(
+ const char *errmsg;
+
+ if (macro->contents->nelts == 0) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02799)
+ "macro '%s' (%s): empty contents!",
+ macro->name, macro->location);
+ return NULL; /* no need to further warnings... */
+@@ -526,7 +525,7 @@ static const char *check_macro_contents(
+
+ for (i = 0; i < nelts; i++) {
+ if (!used->elts[i]) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02800)
+ "macro '%s' (%s): argument '%s' (#%d) never used",
+ macro->name, macro->location, names[i], i + 1);
+ }
+@@ -719,7 +718,8 @@ static const char *macro_section(cmd_par
+ return BEGIN_MACRO " macro definition: empty name";
+ }
+
+- warn_if_non_blank("non blank chars found after " BEGIN_MACRO " closing '>'",
++ warn_if_non_blank(APLOGNO(02801) "non blank chars found after "
++ BEGIN_MACRO " closing '>'",
+ endp+1, cmd->config_file);
+
+ /* coldly drop '>[^>]*$' out */
+@@ -736,7 +736,7 @@ static const char *macro_section(cmd_par
+
+ if (macro != NULL) {
+ /* already defined: warn about the redefinition */
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02802)
+ "macro '%s' multiply defined: "
+ "%s, redefined on line %d of \"%s\"",
+ macro->name, macro->location,
+@@ -761,7 +761,7 @@ static const char *macro_section(cmd_par
+ apr_psprintf(pool, "macro '%s' (%s)", macro->name, macro->location);
+
+ if (looks_like_an_argument(name)) {
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
++ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02803)
+ "%s better prefix a macro name with any of '%s'",
+ where, ARG_PREFIX);
+ }
+--- apache2.orig/modules/examples/mod_example_hooks.c
++++ apache2/modules/examples/mod_example_hooks.c
+@@ -15,7 +15,7 @@
+ */
+
+ /*
+- * Apache example module. Provide demonstrations of how modules do things.
++ * Apache example_hooks module. Provide demonstrations of how modules do things.
+ * It is not meant to be used in a production server. Since it participates
+ * in all of the processing phases, it could conceivable interfere with
+ * the proper operation of other modules -- particularly the ones related
+@@ -26,7 +26,7 @@
+ * prefixed with 'x_' instead of 'example_'.
+ *
+ * To use mod_example_hooks, configure the Apache build with
+- * --enable-example and compile. Set up a <Location> block in your
++ * --enable-example-hooks and compile. Set up a <Location> block in your
+ * configuration file like so:
+ *
+ * <Location /example>
+@@ -328,11 +328,11 @@ static x_cfg *our_cconfig(const conn_rec
+ static void example_log_each(apr_pool_t *p, server_rec *s, const char *note)
+ {
+ if (s != NULL) {
+- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "mod_example: %s", note);
++ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "mod_example_hooks: %s", note);
+ } else {
+ apr_file_t *out = NULL;
+ apr_file_open_stderr(&out, p);
+- apr_file_printf(out, "mod_example traced in non-loggable "
++ apr_file_printf(out, "mod_example_hooks traced in non-loggable "
+ "context: %s\n", note);
+ }
+ }
+@@ -703,7 +703,7 @@ static void *x_merge_server_config(apr_p
+ * declaration near the bottom of this file.) Note that these may be *
+ * called for situations that don't relate primarily to our function - in *
+ * other words, the fixup handler shouldn't assume that the request has *
+- * to do with "example" stuff. *
++ * to do with "example_hooks" stuff. *
+ * *
+ * With the exception of the content handler, all of our routines will be *
+ * called for each request, unless an earlier handler from another module *
+--- apache2.orig/modules/http/http_protocol.c
++++ apache2/modules/http/http_protocol.c
+@@ -1608,8 +1608,8 @@ AP_DECLARE(void) ap_method_list_add(ap_m
+ * bitmask.
+ */
+ methnum = ap_method_number_of(method);
+- l->method_mask |= (AP_METHOD_BIT << methnum);
+ if (methnum != M_INVALID) {
++ l->method_mask |= (AP_METHOD_BIT << methnum);
+ return;
+ }
+ /*
+@@ -1641,15 +1641,15 @@ AP_DECLARE(void) ap_method_list_remove(a
+ * by a module, use the bitmask.
+ */
+ methnum = ap_method_number_of(method);
+- l->method_mask |= ~(AP_METHOD_BIT << methnum);
+ if (methnum != M_INVALID) {
++ l->method_mask &= ~(AP_METHOD_BIT << methnum);
+ return;
+ }
+ /*
+ * Otherwise, see if the method name is in the array of string names.
+ */
+ if (l->method_list->nelts != 0) {
+- register int i, j, k;
++ int i, j, k;
+ methods = (char **)l->method_list->elts;
+ for (i = 0; i < l->method_list->nelts; ) {
+ if (strcmp(method, methods[i]) == 0) {
+--- apache2.orig/modules/ldap/util_ldap.c
++++ apache2/modules/ldap/util_ldap.c
+@@ -1824,7 +1824,7 @@ start_over:
+ * combination, which might be reused unintentionally next time this
+ * connection is used from the connection pool.
+ */
+- ldc->must_rebind = 0;
++ ldc->must_rebind = 1;
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "LDC %pp used for authn, must be rebound", ldc);
+ }
+
+--- apache2.orig/modules/mappers/mod_negotiation.c
++++ apache2/modules/mappers/mod_negotiation.c
+@@ -1707,7 +1707,7 @@ static void set_language_quality(negotia
+ * we are allowed to use the prefix of in HTTP/1.1
+ */
+ char *lang = ((char **) (variant->content_languages->elts))[j];
+- int idx = -1;
++ int idx;
+
+ /* If we wish to fallback or
+ * we use our own LanguagePriority index.
+--- apache2.orig/modules/slotmem/mod_slotmem_shm.c
++++ apache2/modules/slotmem/mod_slotmem_shm.c
+@@ -213,19 +213,19 @@ static apr_status_t restore_slotmem(void
+ rv = APR_SUCCESS;
+ apr_md5(digest2, ptr, nbytes);
+ if (memcmp(digest, digest2, APR_MD5_DIGESTSIZE)) {
+- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,
+ APLOGNO(02551) "bad md5 match");
+ rv = APR_EGENERAL;
+ }
+ }
+ }
+ else {
+- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
++ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
+ APLOGNO(02552) "at EOF... bypassing md5 match check (old persist file?)");
+ }
+ }
+ else if (nbytes != size) {
+- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,
+ APLOGNO(02553) "Expected %" APR_SIZE_T_FMT ": Read %" APR_SIZE_T_FMT,
+ size, nbytes);
+ rv = APR_EGENERAL;
+--- apache2.orig/server/scoreboard.c
++++ apache2/server/scoreboard.c
+@@ -484,8 +484,14 @@ static int update_child_status_internal(
+ ws->conn_bytes = 0;
+ }
+ if (r) {
+- apr_cpystrn(ws->client, ap_get_remote_host(c, r->per_dir_config,
+- REMOTE_NOLOOKUP, NULL), sizeof(ws->client));
++ const char *client = ap_get_remote_host(c, r->per_dir_config,
++ REMOTE_NOLOOKUP, NULL);
++ if (!client || !strcmp(client, c->client_ip)) {
++ apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
++ }
++ else {
++ apr_cpystrn(ws->client, client, sizeof(ws->client));
++ }
+ copy_request(ws->request, sizeof(ws->request), r);
+ if (r->server) {
+ apr_snprintf(ws->vhost, sizeof(ws->vhost), "%s:%d",
+--- apache2.orig/server/util_ebcdic.c
++++ apache2/server/util_ebcdic.c
+@@ -104,8 +104,10 @@ int ap_rvputs_proto_in_ascii(request_rec
+ len = strlen(s);
+ ascii_s = apr_pstrmemdup(r->pool, s, len);
+ ap_xlate_proto_to_ascii(ascii_s, len);
+- if (ap_rputs(ascii_s, r) < 0)
++ if (ap_rputs(ascii_s, r) < 0) {
++ va_end(va);
+ return -1;
++ }
+ written += len;
+ }
+ va_end(va);
diff --git a/debian/patches/series b/debian/patches/series
index 7f640a7..9945c54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@ suexec-CVE-2007-1742.patch
customize_apxs.patch
build_suexec-custom.patch
pull_upstream_2.4.x_branch.patch
-CVE-2014-3581.patch
# This patch is applied manually
#suexec-custom.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git
More information about the Pkg-apache-commits
mailing list