From 76f0b4ece017910360efb5951bc1037e3519c2f8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 27 Feb 2009 09:13:11 +0000
Subject: [PATCH] patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ

---
 ChangeLog          | 4 ++++
 Documentation.html | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f2550028e..c4a7b30c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2602633 [core] support column name having square brackets, 
   thanks to Herman van Rink - helmo
 
+3.1.4.0 (not yet released)
++ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
+  thanks to JT Justman - jtjustman
+
 3.1.3.0 (not yet released)
 + [lang] Turkish update, thanks to Burak Yavuz
 - patch #2496403 [display] Multi-row change with "]",
diff --git a/Documentation.html b/Documentation.html
index d623d6f9e..b213bce23 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2931,6 +2931,15 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 	    <tt>SuhosinDisableWarning</tt> directive</a>.
     </p>
 
+<h4 id="faq1_39">
+    <a href="#faq1_39">1.39 When I try to connect via https, I can log in, 
+    but then my connection is redirected back to http. What can cause this 
+    behavior?</a></h4>
+
+<p> Be sure that you have enabled <tt>SSLOptions</tt> and <tt>StdEnvVars</tt>
+in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>
+
+
 <h3 id="faqconfig">Configuration</h3>
 
 <h4 id="faq2_1">