From 4a5f1ffc17e29b751804e59ecd7b12e67c21b146 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          | 2 ++
 Documentation.html | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 28257b3d7d..15d7b55200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
 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
diff --git a/Documentation.html b/Documentation.html
index f5400d5816..d1a0e136a8 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2906,6 +2906,14 @@ 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">
-- 
2.11.4.GIT