Enable mod_rewrite to recognize SSL variables (using ssl_var_lookup)

Submitted by: Joe Orton
Reviewed by: Madhusudan Mathihalli

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

diff --git a/CHANGES b/CHANGES
index ffc82b21a58ccb26817143b7a93953fff8bff9e6..adac282caf09cf791a8d150c36bea710f18477a2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_rewrite: Support for recognizing SSL variables in RewriteCond
+     using the new "SSL:" format.  [Joe Orton, Madhusudan Mathihalli]
+
   *) mod_setenvif: Remove "support" for Remote_User variable which
      never worked at all. PR 25725.  [André Malo]
 

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 12aa6ec82da4f15db5e8b1322b67e04b2e02f1c3..bf1f6456f5a70d567c6825abd146ea433b8a0198 100644 (file)
--- 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>
@@ -604,6 +605,11 @@ 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> can be
+        any SSL environment variable. This is looked-up via internal
+        SSL structures from the Apache server process.</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
@@ -1779,4 +1785,4 @@ RewriteRule  ^/([^/]+)/~([^/]+)/(.*)$   /u/${real-to-user:$2|nobody}/$3.$1
 </div><div id="footer">
 <p class="apache">Copyright 1999-2004 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="../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_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 9d685efcb2b732930f647d5983dba92660aa30ea..11f941462139f2e3e259a318d5d4baec6aed3562 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -939,6 +939,7 @@ Result:
                  REQUEST_URI<br />
                  REQUEST_FILENAME<br />
                  IS_SUBREQ<br />
+                 HTTPS<br />
               </td>
             </tr>
           </table>
@@ -1013,6 +1014,11 @@ 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> can be
+        any SSL environment variable. This is looked-up via internal
+        SSL structures from the Apache server process.</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