From 3ac25417fa45b88f1e1a2b652fa3c0bbb6c7088e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 28 Feb 2007 22:47:26 +0000
Subject: [PATCH] set default value for ssl connection to MySQL to FALSE

---
 ChangeLog                    | 6 ++++++
 Documentation.html           | 4 ++--
 README                       | 4 ++--
 libraries/Config.class.php   | 2 +-
 libraries/config.default.php | 2 +-
 translators.html             | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a825b612b..1af0183db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2007-02-28 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/config.default.php: set $cfg['Servers'][$i]['ssl'] default
+      value to false, we got reports from some users having problems with the
+      default value of true
+    ### 2.10.0.1 released
+
 2007-02-27 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1659176, memory error displaying
       a table with large BLOBs
diff --git a/Documentation.html b/Documentation.html
index 282578795..2d1520b59 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.10.0 - Documentation</title>
+    <title>phpMyAdmin 2.10.0.1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.10.0 Documentation</h1>
+<h1>phpMyAdmin 2.10.0.1 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index 206831cc1..0d69f49f7 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.10.0
-  --------------
+  Version 2.10.0.1
+  ----------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 29d646a18..4efbf9b9c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -81,7 +81,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.10.0');
+        $this->set('PMA_VERSION', '2.10.0.1');
         /**
          * @deprecated
          */
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 2421251e1..39d5867a7 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -56,7 +56,7 @@ $i++;
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
 $cfg['Servers'][$i]['port']          = '';          // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
-$cfg['Servers'][$i]['ssl']           = true;        // Use SSL for connecting to MySQL server?
+$cfg['Servers'][$i]['ssl']           = false;        // Use SSL for connecting to MySQL server?
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['extension']     = 'mysql';     // The php MySQL extension to use ('mysql' or 'mysqli')
 $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
diff --git a/translators.html b/translators.html
index bceb17da4..dd47ac6c9 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.10.0 - Official translators</title>
+    <title>phpMyAdmin 2.10.0.1 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.10.0 official translators list</h1>
+<h1>phpMyAdmin 2.10.0.1 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>