You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/12/30 20:54:35 UTC
svn commit: r1554302 - in /httpd/httpd/trunk/docs/manual: ./ mod/
Author: minfrin
Date: Mon Dec 30 19:54:34 2013
New Revision: 1554302
URL: http://svn.apache.org/r1554302
Log:
Update transformation.
Modified:
httpd/httpd/trunk/docs/manual/mod/core.html.en
httpd/httpd/trunk/docs/manual/mod/core.xml.de
httpd/httpd/trunk/docs/manual/mod/core.xml.es
httpd/httpd/trunk/docs/manual/mod/core.xml.ja
httpd/httpd/trunk/docs/manual/mod/core.xml.tr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/trunk/docs/manual/sections.html.en
httpd/httpd/trunk/docs/manual/sections.xml.ja
httpd/httpd/trunk/docs/manual/sections.xml.ko
httpd/httpd/trunk/docs/manual/sections.xml.tr
Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Dec 30 19:54:34 2013
@@ -971,6 +971,20 @@ the contents of file-system directories
end of line ($) must be written with care.
</div>
+ <p>From 2.5.0 onwards, named groups and backreferences are captured and
+ written to the environment with the corresponding name in upper case.
+ This allows elements of paths to be referenced from within
+ <a href="expr.html">expressions</a> and modules like
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. In order to prevent confusion, numbered
+ (unnamed) backreferences are ignored. Use named groups instead.</p>
+
+<pre class="prettyprint lang-config">
+<DirectoryMatch ^/var/www/combined/(?<SITENAME>[^/]+)>
+ require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+</DirectoryMatch>
+</pre>
+
+
<h3>See also</h3>
<ul>
<li><code class="directive"><a href="#directory"><Directory></a></code> for
@@ -1804,6 +1818,20 @@ filenames</td></tr>
<p>would match most common Internet graphics formats.</p>
+ <p>From 2.5.0 onwards, named groups and backreferences are captured and
+ written to the environment with the corresponding name in upper case.
+ This allows elements of files to be referenced from within
+ <a href="expr.html">expressions</a> and modules like
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. In order to prevent confusion, numbered
+ (unnamed) backreferences are ignored. Use named groups instead.</p>
+
+<pre class="prettyprint lang-config">
+<FileMatch ^(?<SITENAME>[^/]+)>
+ require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+</FileMatch>
+</pre>
+
+
<h3>See also</h3>
<ul>
<li><a href="../sections.html">How <Directory>, <Location>
@@ -2763,6 +2791,20 @@ matching URLs</td></tr>
<p>would match URLs that contained the substring <code>/extra/data</code>
or <code>/special/data</code>.</p>
+ <p>From 2.5.0 onwards, named groups and backreferences are captured and
+ written to the environment with the corresponding name in upper case.
+ This allows elements of URLs to be referenced from within
+ <a href="expr.html">expressions</a> and modules like
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. In order to prevent confusion, numbered
+ (unnamed) backreferences are ignored. Use named groups instead.</p>
+
+<pre class="prettyprint lang-config">
+<LocationMatch ^/combined/(?<SITENAME>[^/]+)>
+ require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+</LocationMatch>
+</pre>
+
+
<h3>See also</h3>
<ul>
<li><a href="../sections.html">How <Directory>, <Location>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1544629 (outdated) -->
+<!-- English Revision: 344972:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.es?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.es Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1544629 (outdated) -->
+<!-- English Revision: 1040494:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:1544629 (outdated) -->
+<!-- English Revision: 669847:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1302855:1544629 (outdated) -->
+<!-- English Revision: 1302855:1554301 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Mon Dec 30 19:54:34 2013
@@ -932,6 +932,20 @@ proxied resources</td></tr>
identical to the <code class="directive"><a href="#proxy"><Proxy></a></code> directive, except it matches URLs
using <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expressions</a>.</p>
+ <p>From 2.5.0 onwards, named groups and backreferences are captured and
+ written to the environment with the corresponding name in upper case.
+ This allows elements of URLs to be referenced from within
+ <a href="expr.html">expressions</a> and modules like
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. In order to prevent confusion, numbered
+ (unnamed) backreferences are ignored. Use named groups instead.</p>
+
+<pre class="prettyprint lang-config">
+<ProxyMatch ^http://(?<SITENAME>[^/]+)>
+ require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+</ProxyMatch>
+</pre>
+
+
<h3>See also</h3>
<ul>
<li><code class="directive"><a href="#proxy"><Proxy></a></code></li>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1533154 -->
+<!-- English Revision: 1533154:1554301 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1533154 (outdated) -->
+<!-- English Revision: 344971:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Mon Dec 30 19:54:34 2013
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/sections.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.html.en?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.html.en (original)
+++ httpd/httpd/trunk/docs/manual/sections.html.en Mon Dec 30 19:54:34 2013
@@ -286,6 +286,19 @@ at once:</p>
</pre>
+<p>Regular expressions containing <strong>named groups and
+backreferences</strong> are added to the environment with the
+corresponding name in uppercase. This allows elements of filename paths
+and URLs to be referenced from within <a href="expr.html">expressions</a>
+and modules like <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+
+<pre class="prettyprint lang-config">
+<DirectoryMatch ^/var/www/combined/(?<SITENAME>[^/]+)>
+ require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+</DirectoryMatch>
+</pre>
+
+
<h3><a name="expressions" id="expressions">Boolean expressions</a></h3>
Modified: httpd/httpd/trunk/docs/manual/sections.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.ja?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.ja [utf-8] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1384856 (outdated) -->
+<!-- English Revision: 420990:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/sections.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.ko?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.ko [euc-kr] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1384856 (outdated) -->
+<!-- English Revision: 105989:1554301 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/sections.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.tr?rev=1554302&r1=1554301&r2=1554302&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.tr [utf-8] Mon Dec 30 19:54:34 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1300910:1384856 (outdated) -->
+<!-- English Revision: 1300910:1554301 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>