]> granicus.if.org Git - php/commit
Merge branch 'pull-request/868' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:09:41 +0000 (21:09 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:09:41 +0000 (21:09 -0800)
commitabf5b9481bc7fd55e24abd59e174499e29b503b3
treed1d07b539ffbe7cae88a7b5f36144a6b5f1bf554
parent17094017f75cd4cde935c5d6569eee20540ffe36
parentf66013df94f9555f73aea4dd48aee668701f87d9
Merge branch 'pull-request/868' into PHP-5.5

* pull-request/868:
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3