The branch, TESTING has been updated via 6e17d8629c46da6cd88fa91f4be6dcb732169ebe (commit) via 48cf4d398d3b5667522ceb702827fe24061d43f0 (commit) via e5ceb497df8563f73296d7fc894ff00101e21bde (commit) via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit) via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit) via 7e40035275d28fa38fef7f7628bdda3a44d83de5 (commit) via 7d217c9f57d5b97b62439c89f0010d36dac73d28 (commit) via ee26cd1a4001d63c34881ffe2abfff89cebcefac (commit) from d550baf9af9d2f559999c5ab1bb52a9303ba93b6 (commit)
- Log ----------------------------------------------------------------- commit 6e17d8629c46da6cd88fa91f4be6dcb732169ebe Merge: d550baf9af9d2f559999c5ab1bb52a9303ba93b6 48cf4d398d3b5667522ceb702827fe24061d43f0 Author: Marc Delisle marc@infomarc.info Date: Tue Apr 13 18:33:59 2010 -0400
Merge branch 'MAINT_3_3_2' into TESTING
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 3 +- Documentation.html | 59 +++++++++++++++++++++++++++++++++++--------- README | 4 +- libraries/Config.class.php | 2 +- libraries/export/xlsx.php | 1 - translators.html | 4 +- 6 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog index eb437d1..a5c87d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $
-3.3.2.0 (not yet released) +3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing @@ -24,6 +24,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2980582 [interface] Properly format server status parameter. - bug #2973949 [session] SQL History broken (revert patch #2899969), thanks to Dieter Adriaenssens - ruleant +- [doc] Be more specific about problems with Suhosin.
3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/Documentation.html b/Documentation.html index f6b45d0..330161f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <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=utf-8" /> - <title>phpMyAdmin 3.3.2-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.2 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>
@@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2-rc1 + 3.3.2 Documentation </h1> </div> @@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd>
+ <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dd>Whether to display errors from PHP or not.</dd> + + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dd>Whether to gather errors from PHP or not.</dd> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can @@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] = name of the field. The comment is shown as a tool-tip for that field. </dd>
- <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> + <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> <dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> + <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> + <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> + <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> <dd>Whether to display a link to validate a query in any SQL Query box. See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
- <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> + <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> <dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt> @@ -3055,11 +3061,37 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
<p> Yes but the default configuration values of Suhosin are known to cause problems with some operations, for example editing a table with many - columns and no primary key. Tuning information is available at - <a href="http://www.hardened-php.net/hphp/troubleshooting.html"> - http://www.hardened-php.net/hphp/troubleshooting.html</a>, - although the parameter names have changed (<tt>suhosin</tt> instead - of <tt>hphp</tt>). See also the <a href="#cfg_SuhosinDisableWarning"> + columns and no primary key or with textual primary key. +</p> +<p> + Suhosin configuration might lead to malfunction in some cases and it can + not be fully avoided as phpMyAdmin is kind of application which needs to + transfer big amounts of fields in single HTTP request, what is something + what Suhosin tries to prevent. Generally all + <code>suhosin.request.*</code>, <code>suhosin.post.*</code> and + <code>suhosin.get.*</code> directives can have negative effect on + phpMyAdmin usability. You can always find in your error logs which limit + did cause dropping of variable, so you can diagnose the problem and adjust + matching configuration variable. +</p> +<p> + The default values for most Suhosin configuration options will work in most + scenarios, however you might want to adjust at least following parameters: +</p> + +<ul> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_vars">suhosin.request.max_vars</a> should be increased (eg. 2048)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_vars">suhosin.post.max_vars</a> should be increased (eg. 2048)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_array_index_length">suhosin.request.max_array_index_length</a> should be increased (eg. 256)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_array_index_length">suhosin.post.max_array_index_length</a> should be increased (eg. 256)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_totalname_length">suhosin.request.max_totalname_length</a> should be increased (eg. 8192)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_totalname_length">suhosin.post.max_totalname_length</a> should be increased (eg. 8192)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql.bailout_on_error">suhosin.sql.bailout_on_error</a> needs to be disabled (the default)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#logging_configuration">suhosin.log.*</a> should not include SQL, otherwise you get big slowdown</li> +</ul> + + <p> + You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning"> <tt>SuhosinDisableWarning</tt> directive</a>. </p>
@@ -4425,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server. <abbr title="PHP Extension and Application Repository">PEAR</abbr> coding standards</a> on the other hand. Please pay attention to this.</li> + <li>Please enable showing PHP errors and warnings by the + <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> + configuration directive.</li> <li>Please try to keep up the file-naming conventions. Table-related stuff goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related tools to <i>server_*.php</i> and so on.</li> diff --git a/README b/README index 1ca0c38..ae0af44 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.3.2-rc1 - ----------------- + Version 3.3.2 + ------------- 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 6250215..89ef2cf 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.2-rc1'); + $this->set('PMA_VERSION', '3.3.2'); /** * @deprecated */ diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 86a17a9..1b24c4c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -59,7 +59,6 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
$workbookWriter = new PHPExcel_Writer_Excel2007($workbook); - $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename);
if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { diff --git a/translators.html b/translators.html index bca8cd5..00f7ab3 100644 --- a/translators.html +++ b/translators.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=utf-8" /> - <title>phpMyAdmin 3.3.2-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.2 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>
@@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2-rc1 + 3.3.2 official translators list </h1> </div>
hooks/post-receive