Reflect current implementation

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

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 4e092037e0c7f7ef169b962914f23d58e0b4d3e9..0434e35a98e0430e0cebca776a4b86a7712d81bb 100644 (file)
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1395,7 +1395,7 @@ comp     ::= word "<strong>==</strong>" word | word "<strong>eq</strong>" word
            | word "<strong>&gt;</strong>"  word | word "<strong>gt</strong>" word
            | word "<strong>&gt;=</strong>" word | word "<strong>ge</strong>" word
            | word "<strong>in</strong>" "<strong>{</strong>" wordlist "<strong>}</strong>"
-           | word "<strong>in</strong>" "<strong>OID(</strong>" word "<strong>)</strong>"
+           | word "<strong>in</strong>" "<strong>PeerExtList(</strong>" word "<strong>)</strong>"
            | word "<strong>=~</strong>" regex
            | word "<strong>!~</strong>" regex
 
@@ -1437,10 +1437,11 @@ SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \<br />
             and %{TIME_HOUR} &gt;= 8 and %{TIME_HOUR} &lt;= 20       ) \<br />
            or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
 </code></p></div>
-<p>The <code>OID()</code> function expects to find zero or more instances
-of the given OID in the client certificate, and compares the left-hand side
-string against the value of matching OID attributes. Every matching OID is
-checked, until a match is found.
+<p>The <code>PeerExtList(<em>object id</em>)</code> function expects to find
+zero or more instances of the X.509 Certificate Extension (as identified by
+the given <em>object id</em>) in the client certificate, and compares the
+left-hand side string against the value of any matching attribute value. Every
+extension with the specified object id is checked, until a match is found.
 </p>
 
 <p><em>Standard CGI/1.0 and Apache variables:</em></p>
@@ -1719,4 +1720,4 @@ SSLVerifyDepth 10
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<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="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 011510455d6388b6e43ea66b6b923ba3a1280630..3182012f66daec3fa263dec41a3bde4f3bb095da 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1216,7 +1216,7 @@ comp     ::= word "<strong>==</strong>" word | word "<strong>eq</strong>" word
            | word "<strong>&gt;</strong>"  word | word "<strong>gt</strong>" word
            | word "<strong>&gt;=</strong>" word | word "<strong>ge</strong>" word
            | word "<strong>in</strong>" "<strong>{</strong>" wordlist "<strong>}</strong>"
-           | word "<strong>in</strong>" "<strong>OID(</strong>" word "<strong>)</strong>"
+           | word "<strong>in</strong>" "<strong>PeerExtList(</strong>" word "<strong>)</strong>"
            | word "<strong>=~</strong>" regex
            | word "<strong>!~</strong>" regex
 
@@ -1259,10 +1259,11 @@ SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \<br />
             and %{TIME_HOUR} &gt;= 8 and %{TIME_HOUR} &lt;= 20       ) \<br />
            or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
 </example>
-<p>The <code>OID()</code> function expects to find zero or more instances
-of the given OID in the client certificate, and compares the left-hand side
-string against the value of matching OID attributes. Every matching OID is
-checked, until a match is found.
+<p>The <code>PeerExtList(<em>object id</em>)</code> function expects to find
+zero or more instances of the X.509 Certificate Extension (as identified by
+the given <em>object id</em>) in the client certificate, and compares the
+left-hand side string against the value of any matching attribute value. Every
+extension with the specified object id is checked, until a match is found.
 </p>
 
 <p><em>Standard CGI/1.0 and Apache variables:</em></p>