The branch, master has been updated via a11a782cb6a387a9defb380887844ccd7bcbe96b (commit) via 969c59e8a676746c5a14881698fb473bd4c60c26 (commit) via 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 (commit) from a5394bdc1de0382f7939233a04a0b5f3a0491219 (commit)

- Log ----------------------------------------------------------------- commit a11a782cb6a387a9defb380887844ccd7bcbe96b Merge: 969c59e8a676746c5a14881698fb473bd4c60c26 a5394bdc1de0382f7939233a04a0b5f3a0491219 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Aug 7 18:23:22 2011 +0530

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 969c59e8a676746c5a14881698fb473bd4c60c26 Merge: 55c6eacf3e56da064dae69650480d84acd92d5a3 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Aug 7 18:21:34 2011 +0530

Merge branch 'QA_3_4'

Conflicts: server_status.php

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

Summary of changes: Documentation.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Documentation.html b/Documentation.html index 393e5c7..72387ab 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3095,6 +3095,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] <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.get.max_value_length">suhosin.get.max_value_length</a> should be increased (eg. 1024)</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>

hooks/post-receive