From: Paul Querna <pquerna@apache.org>
Date: Fri, 22 Jul 2005 10:00:46 +0000 (+0000)
Subject: build.
X-Git-Tag: 2.1.7~5^2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8bce20460c2a5fc8f5b8f9412e8c663c7dcaf01;p=thirdparty%2Fapache%2Fhttpd.git

build.


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

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index fb5fbe16057..5fa606763e6 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1352,7 +1352,7 @@ boolean expression is true</td></tr>
 </table>
 <p>
 This directive specifies a general access requirement which has to be
-fulfilled in order to allow access. It's a very powerful directive because the
+fulfilled in order to allow access. It is a very powerful directive because the
 requirement specification is an arbitrarily complex boolean expression
 containing any number of access checks.</p>
 <div class="warning">
@@ -1380,6 +1380,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>=~</strong>" regex
            | word "<strong>!~</strong>" regex
 
@@ -1421,6 +1422,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>
 
 <p><em>Standard CGI/1.0 and Apache variables:</em></p>
 <pre>
diff --git a/docs/manual/programs/httxt2dbm.html.en b/docs/manual/programs/httxt2dbm.html.en
index 394b1125f40..72e6ddccae3 100644
--- a/docs/manual/programs/httxt2dbm.html.en
+++ b/docs/manual/programs/httxt2dbm.html.en
@@ -70,8 +70,8 @@
 <div class="section">
 <h2><a name="examples" id="examples">Examples</a></h2>
     <div class="example"><p><code>
-      httxt2dbm -i rewritemap.txt -i rewritemap.dbm<br />
-      httxt2dbm -f SDBM -i rewritemap.txt -i rewritemap.dbm<br />
+      httxt2dbm -i rewritemap.txt -o rewritemap.dbm<br />
+      httxt2dbm -f SDBM -i rewritemap.txt -o rewritemap.dbm<br />
     </code></p></div>
 </div></div>
 <div class="bottomlang">