Git June 2016

git@phpmyadmin.net

20 participants
264 discussions

[phpmyadmin/phpmyadmin] 1c77a4: Fix #12281 Copying a user resets SSL to None
by Madhura Jayaratne 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1c77a4ef0dbd7af493018b942f8bd46e38871c93 https://github.com/phpmyadmin/phpmyadmin/commit/1c77a4ef0dbd7af493018b942f8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix #12281 Copying a user resets SSL to None Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: c4e7447a965ca50f53a947df7f24f72e86154b53 https://github.com/phpmyadmin/phpmyadmin/commit/c4e7447a965ca50f53a947df7f2… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M js/pmd/move.js M libraries/Error.php M libraries/dbi/DBIMysqli.php M po/pt_BR.po M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281 Conflicts: ChangeLog Commit: c2322a637dc1e01322817618f9c5a529e184ce7f https://github.com/phpmyadmin/phpmyadmin/commit/c2322a637dc1e01322817618f9c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #12296 from madhuracj/bug12281 Fix #12281 Copying a user resets SSL to None Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4fd270965082...c2322a637dc1

1 0

[phpmyadmin/phpmyadmin] 4fd270: Avoid rewriting PHP stack frames
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Avoid rewriting PHP stack frames Surprisingly PHP stack frames are passed as references to the error handling code, thus changing value there leads to changing value in the executed code. With MySQL issuing warning about incompatible version (different runtime library than compile time), handling this warning rewrites current stack frame and the mysql_real_connect later sees parameters as processed by Error class for display. We now create copy of the stacktrace to avoid this. Fixes #12279 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 4fd270: Avoid rewriting PHP stack frames
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Avoid rewriting PHP stack frames Surprisingly PHP stack frames are passed as references to the error handling code, thus changing value there leads to changing value in the executed code. With MySQL issuing warning about incompatible version (different runtime library than compile time), handling this warning rewrites current stack frame and the mysql_real_connect later sees parameters as processed by Error class for display. We now create copy of the stacktrace to avoid this. Fixes #12279 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7a6632075336c8ca15e41094d63650442f8fe9d6 https://github.com/phpmyadmin/phpmyadmin/commit/7a6632075336c8ca15e41094d63… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bc426742dce...7a6632075336

1 0

[phpmyadmin/phpmyadmin] 5e536a: Do not set key if not set in config
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5e536ab5f9fa19b288d32b2eddb7546c73f9efb2 https://github.com/phpmyadmin/phpmyadmin/commit/5e536ab5f9fa19b288d32b2eddb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Do not set key if not set in config Issue #12293 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5bc426742dced3cde8c859bbea885d844b3a6a07 https://github.com/phpmyadmin/phpmyadmin/commit/5bc426742dced3cde8c859bbea8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5f8e40941b63...5bc426742dce

1 0

[phpmyadmin/phpmyadmin] 5e536a: Do not set key if not set in config
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5e536ab5f9fa19b288d32b2eddb7546c73f9efb2 https://github.com/phpmyadmin/phpmyadmin/commit/5e536ab5f9fa19b288d32b2eddb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Do not set key if not set in config Issue #12293 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/docker] ae243b: Add test for sessions after shutdown (issue #32)
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: ae243b807713c90469f5256e1670dad6af60d6e7 https://github.com/phpmyadmin/docker/commit/ae243b807713c90469f5256e1670dad… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M .travis.yml Log Message: ----------- Add test for sessions after shutdown (issue #32) Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/docker] 96e3c9: Try testing docker compose as well
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 96e3c94c6b3317ccb4c8cd8845f90a9cf0af7721 https://github.com/phpmyadmin/docker/commit/96e3c94c6b3317ccb4c8cd8845f90a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M .travis.yml Log Message: ----------- Try testing docker compose as well Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/docker] 23cb07: Use persistent volume for sessions
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 23cb0767660dd4c4b3e35bcfb775530f2d45c139 https://github.com/phpmyadmin/docker/commit/23cb0767660dd4c4b3e35bcfb775530… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M Dockerfile M docker-compose.yml M run.sh Log Message: ----------- Use persistent volume for sessions Issue #32 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 5f8e40: Do not remove phpseclib's bootstrap file
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f8e40941b63c1d3ee57f56bee44352ec9aa3ced https://github.com/phpmyadmin/phpmyadmin/commit/5f8e40941b63c1d3ee57f56bee4… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M scripts/create-release.sh Log Message: ----------- Do not remove phpseclib's bootstrap file Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 171bcb: Fix MySQL SSL connection with some PHP versions
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 171bcb9a85bbb6ffb7d0a6c4b0cbdb5f7ded9387 https://github.com/phpmyadmin/phpmyadmin/commit/171bcb9a85bbb6ffb7d0a6c4b0c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php Log Message: ----------- Fix MySQL SSL connection with some PHP versions It seems that for some PHP versions this flag is needed even though it's not documented like this. Anyway this flag doesn't cause any harm, so lets keep it enabled. Issue #12293 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2016