From: Joe Orton <jorton@apache.org>
Date: Fri, 27 Aug 2004 15:04:36 +0000 (+0000)
Subject: Backport HTTPS, SSL: variable lookups.
X-Git-Tag: STRIKER_2_0_51_RC1^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f91181a4eaf1db36985cee76a0192760c6c689;p=thirdparty%2Fapache%2Fhttpd.git

Backport HTTPS, SSL: variable lookups.

Submitted by: Madhu, Joe


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

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 3586965c5fc..d4e967153af 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -530,6 +530,7 @@ Result:
                  REQUEST_URI<br />
                  REQUEST_FILENAME<br />
                  IS_SUBREQ<br />
+                 HTTPS<br />
               </td>
             </tr>
           </table>
@@ -581,6 +582,14 @@ Result:
 
                   <dd>The full local filesystem path to the file or
                   script matching the request.</dd>
+
+                  <dt><code>HTTPS</code></dt>
+
+                  <dd>Will contain the text "on" if the connection is
+                  using SSL/TLS, or "off" otherwise.  (This variable
+                  can be safely used regardless of whether
+                  <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is loaded).</dd>
+
                 </dl>
 </div>
         </li>
@@ -604,6 +613,15 @@ Result:
         Apache structures and (if not found there) via
         <code>getenv()</code> from the Apache server process.</li>
 
+        <li>There is the special format: 
+        <code>%{SSL:variable}</code> where <em>variable</em> is the
+        name of an <a href="mod_ssl.html#envvars">SSL environment
+        variable</a>; this can be used whether or not
+        <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is loaded, but will always expand to
+        the empty string if it is not.  Example:
+        <code>%{SSL:SSL_CIPHER_USEKEYSIZE}</code> may expand to
+        <code>128</code>.</li>
+
         <li>There is the special format:
         <code>%{HTTP:header}</code> where <em>header</em> can be
         any HTTP MIME-header name. This is looked-up from the HTTP
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 2e99a59e21f..25cdd9ebc0a 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $Revision: 1.11.2.10 $ -->
+<!-- $Revision: 1.11.2.11 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -941,6 +941,7 @@ Result:
                  REQUEST_URI<br />
                  REQUEST_FILENAME<br />
                  IS_SUBREQ<br />
+                 HTTPS<br />
               </td>
             </tr>
           </table>
@@ -992,6 +993,14 @@ Result:
 
                   <dd>The full local filesystem path to the file or
                   script matching the request.</dd>
+
+                  <dt><code>HTTPS</code></dt>
+
+                  <dd>Will contain the text "on" if the connection is
+                  using SSL/TLS, or "off" otherwise.  (This variable
+                  can be safely used regardless of whether
+                  <module>mod_ssl</module> is loaded).</dd>
+
                 </dl>
 </note>
         </li>
@@ -1015,6 +1024,15 @@ Result:
         Apache structures and (if not found there) via
         <code>getenv()</code> from the Apache server process.</li>
 
+        <li>There is the special format: 
+        <code>%{SSL:variable}</code> where <em>variable</em> is the
+        name of an <a href="mod_ssl.html#envvars">SSL environment
+        variable</a>; this can be used whether or not
+        <module>mod_ssl</module> is loaded, but will always expand to
+        the empty string if it is not.  Example:
+        <code>%{SSL:SSL_CIPHER_USEKEYSIZE}</code> may expand to
+        <code>128</code>.</li>
+
         <li>There is the special format:
         <code>%{HTTP:header}</code> where <em>header</em> can be
         any HTTP MIME-header name. This is looked-up from the HTTP