]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3faa20 720ba67)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:41:04 +0000 (21:41 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:47:40 +0000 (21:47 -0800)
commitbfc8d297be96b10f82190e58d8de67e101c33573
treec55902dfcefaa593f1c24be9c04b70d0070d8e66tree | snapshot
parentf3faa205c757e49a43f6672fc28aa296b4b65e11commit | diff
parent720ba679485cb7120911af8013b7b6ab72a47884commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  update news
  update NEWS
  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
  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

Conflicts:
ext/standard/crypt.c
ext/standard/crypt.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.