From aaac3066d68ba36a20051157c23cce6589816406 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 22 Mar 2007 17:07:06 +0000
Subject: [PATCH] Added FAQ entry about header errors under IIS caused by an
 end-of-line character

---
 ChangeLog          | 2 ++
 Documentation.html | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 770185ae9..743019e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1643758 [import] Error #1264 importing NULL values in MySQL 5.0
 - bug #1523747 [innodb] make warning about row count more visible
 - bug #1676012 [auth] strip non-US-ASCII characters (RFC2616)
+- bug #1679440 Added FAQ entry about header errors under IIS caused by 
+  an end-of-line character 
 - [gui] avoid displaying a wide selector in server selection
 + [core] added PMA_fatalError() and made use of it
 . [core] added PMA_isValid() and PMA_ifSetOr() for variable handling
diff --git a/Documentation.html b/Documentation.html
index a69d719ba..bfef4bdbd 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2769,7 +2769,10 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 <p> Edit your <i>config.inc.php</i> file and ensure there is nothing
     (I.E. no blank lines, no spaces, no characters...) neither before the
     <tt>&lt;?php</tt> tag at the beginning, neither after the <tt>?&gt;</tt>
-    tag at the end.</p>
+    tag at the end. We also got a report from a user under IIS, that used
+    a zipped distribution kit: the file <tt>libraries/Config.class.php</tt>
+    contained an end-of-line character (hex 0A) at the end; removing this character
+    cleared his errors.</p>
 
 <h4 id="faq2_2">
     <a href="#faq2_2">2.2 phpMyAdmin can't connect to MySQL. What's wrong?</a></h4>