[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e9e399: 4.2.13 release

[Michal Čihař]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e9e3998949adbacf82b90e9d2061bf56e609a373
      https://github.com/phpmyadmin/phpmyadmin/commit/e9e3998949adbacf82b90e9d2061bf56e609a373
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-30 (Sun, 30 Nov 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.13 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 9b2479b7216dd91a6cc2f231c0fd6b85d457f6e2
      https://github.com/phpmyadmin/phpmyadmin/commit/9b2479b7216dd91a6cc2f231c0fd6b85d457f6e2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ChangeLog
    M url.php

  Log Message:
  -----------
  bug #4612 [security] XSS vulnerability in redirection mechanism

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 1ac863c7573d12012374d5d41e5c7dc5505ea6e1
      https://github.com/phpmyadmin/phpmyadmin/commit/1ac863c7573d12012374d5d41e5c7dc5505ea6e1
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M ChangeLog
    M libraries/common.inc.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  bug #4611 [security] DOS attack with long passwords

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: a59ef664974c20b688261fcd4d77554fd1050cdf
      https://github.com/phpmyadmin/phpmyadmin/commit/a59ef664974c20b688261fcd4d77554fd1050cdf
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.13.1 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 94952f52dad9490b4260067b68183a6d8c893869
      https://github.com/phpmyadmin/phpmyadmin/commit/94952f52dad9490b4260067b68183a6d8c893869
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Adjust testcase to new split methods

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: f2a4b56afe4291513434db2f7b5541774d13f48b
      https://github.com/phpmyadmin/phpmyadmin/commit/f2a4b56afe4291513434db2f7b5541774d13f48b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Add missing call to test

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4ac6b01e17c2e4a8183c0e5ae880b88959d1d85f
      https://github.com/phpmyadmin/phpmyadmin/commit/4ac6b01e17c2e4a8183c0e5ae880b88959d1d85f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php
    M libraries/common.inc.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M url.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2

Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.class.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/942f366e7160...4ac6b01e17c2