apache 2.2/2.4 compatible config

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 71006ea14828e392f39960a57e46755436919cb3..110be5ae2c8c515be73bf507177629cebe3eca66 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,22 +1,12 @@
---- libraries/config.default.php.orig  2006-11-09 13:42:07.000000000 +0100
-+++ libraries/config.default.php       2006-11-09 16:47:08.000000000 +0100
-@@ -2,7 +2,7 @@
- 
- /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
- 
--/* $Id$ */
-+/* $Id$ */
- // vim: expandtab sw=4 ts=4 sts=4:
+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';
  
  /**
-@@ -68,8 +68,8 @@
-                                                     // The controluser is also
-                                                     // used for all relational
-                                                     // features (pmadb)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
--$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
- $cfg['Servers'][$i]['nopassword']    = FALSE;       // Whether to try to connect without password
+  * MySQL password (only needed with 'config' auth_type)