Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 783cacbd1e9823374d24a70e237654581b07563c https://github.com/phpmyadmin/phpmyadmin/commit/783cacbd1e9823374d24a70e2376... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)

Changed paths: M js/ajax.js M libraries/common.inc.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

Log Message: ----------- Workaround for token mismatch error on server session timeout for config and http authentication types

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 5e3a4451e6b95f4298976c7bcb9af1531caff68e https://github.com/phpmyadmin/phpmyadmin/commit/5e3a4451e6b95f4298976c7bcb9a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M js/ajax.js M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationHttp.class.php

Log Message: ----------- Use a separate flag to avoid confusion

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 090c10cccfc7071ba66ca26d7629ce3e703f70bc https://github.com/phpmyadmin/phpmyadmin/commit/090c10cccfc7071ba66ca26d7629... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php

Log Message: ----------- Document what these flags do

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 6f8a253daff68dfe4fabae713d10034fe40d4cde https://github.com/phpmyadmin/phpmyadmin/commit/6f8a253daff68dfe4fabae713d10... Author: Marc Delisle marc@infomarc.info Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M js/ajax.js M libraries/common.inc.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

Log Message: ----------- Merge pull request #1407 from madhuracj/tokenMismatch

Workaround for token mismatch error on server session timeout for config and http authentication types

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/880757558665...6f8a253daff6