[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3c583b: Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-securi...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3c583b86d46f72f3ac331fea64fa02c3fbf38561
      https://github.com/phpmyadmin/phpmyadmin/commit/3c583b86d46f72f3ac331fea64fa02c3fbf38561
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/sql-parser/autoload.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security


  Commit: 51a0d2f25a71432570f59dd9053b9dbbc93733b3
      https://github.com/phpmyadmin/phpmyadmin/commit/51a0d2f25a71432570f59dd9053b9dbbc93733b3
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

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

  Log Message:
  -----------
  4.5.5.1 release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: 9eee3353a6141342f8b109d09737afde5550daf9
      https://github.com/phpmyadmin/phpmyadmin/commit/9eee3353a6141342f8b109d09737afde5550daf9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_5' into QA_4_6


  Commit: 4efb1c8a595f0fcbef5aad4d7460ec7b228f0cc4
      https://github.com/phpmyadmin/phpmyadmin/commit/4efb1c8a595f0fcbef5aad4d7460ec7b228f0cc4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_6'


  Commit: 380deb4f3956cba4a6f5e3781cc0c0d14752556d
      https://github.com/phpmyadmin/phpmyadmin/commit/380deb4f3956cba4a6f5e3781cc0c0d14752556d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M libraries/session.inc.php
    M libraries/session.lib.php

  Log Message:
  -----------
  Share code for generating token

There is no need to have two copies of that.

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


  Commit: b856502d6443a41b1772661ad9f33da01758d7e9
      https://github.com/phpmyadmin/phpmyadmin/commit/b856502d6443a41b1772661ad9f33da01758d7e9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/session.lib.php

  Log Message:
  -----------
  Prefer phpseclib if avaible

It does better decisions about which backend to use than simply using
openssl.

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eb536f2c764d...b856502d6443