[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11739-g35a5f31

[Marc Delisle]

The branch, master has been updated
       via  35a5f312836f7119f9fd9ce7c1b241c381d8b6f7 (commit)
       via  08ee54d4a43b1bd6eff1e6695ff8553e6f26b37a (commit)
      from  7e197b695e50f3ba751e48cc45f28ab397534f6f (commit)


- Log -----------------------------------------------------------------
commit 35a5f312836f7119f9fd9ce7c1b241c381d8b6f7
Merge: 7e197b695e50f3ba751e48cc45f28ab397534f6f 08ee54d4a43b1bd6eff1e6695ff8553e6f26b37a
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jul 24 08:08:51 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    1 +
 libraries/config.default.php |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index feefa80..67d43b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
 - bug #3374374 [interface] Fix footnote for inexact count while browsing
 - bug #3372807 [interface] Fix security warning link in setup
 - bug #3374347 [display] Backquotes in normal text on import page
+- bug #3358750 [core] With Suhosin, urls are too long in edit links
 
 3.4.3.2 (2011-07-23)
 - [security] Fixed XSS vulnerability, see PMASA-2011-9
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 5762531..edf0264 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2635,8 +2635,11 @@ $cfg['CheckConfigurationPermissions'] = true;
  * Limit for length of URL in links. When length would be above this limit, it
  * is replaced by form with button.
  * This is required as some web servers (IIS) have problems with long URLs.
+ * The recommended limit is 2000 
+ * (see http://www.boutell.com/newfaq/misc/urllength.html) but we put
+ * 1000 to accommodate Suhosin, see bug #3358750.
  */
-$cfg['LinkLengthLimit'] = 2000;
+$cfg['LinkLengthLimit'] = 1000;
 
 /**
  * Disable the table maintenance mass operations, like optimizing or


hooks/post-receive
-- 
phpMyAdmin