apache 2.2/2.4 compatible config

[packages/phpMyAdmin.git] / phpMyAdmin-config.patch

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 1e34741c229cd607a3f7931dd314c0d2da84434a..110be5ae2c8c515be73bf507177629cebe3eca66 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,11 +1,12 @@
---- phpMyAdmin-2.4.0/config.inc.php~   Sun Feb 23 21:05:16 2003
-+++ phpMyAdmin-2.4.0/config.inc.php    Wed Apr 16 12:07:48 2003
-@@ -70,7 +70,7 @@
-                                                     // (this user must have read-only
- $cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
-                                                     // and "mysql/db" tables)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
+diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php
+--- phpMyAdmin-3.1.0-all-languages/libraries/config.default.php        2008-11-28 14:21:00.000000000 +0100
++++ phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php    2008-12-02 10:31:40.200149063 +0100
+@@ -180,7 +180,7 @@ $cfg['Servers'][$i]['auth_swekey_config'
+  *
+  * @global string $cfg['Servers'][$i]['user']
+  */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
+ 
+ /**
+  * MySQL password (only needed with 'config' auth_type)