diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:41:04 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:47:40 -0800 |
| commit | bfc8d297be96b10f82190e58d8de67e101c33573 (patch) | |
| tree | c55902dfcefaa593f1c24be9c04b70d0070d8e66 /ext/curl/multi.c | |
| parent | f3faa205c757e49a43f6672fc28aa296b4b65e11 (diff) | |
| parent | 720ba679485cb7120911af8013b7b6ab72a47884 (diff) | |
| download | php-git-bfc8d297be96b10f82190e58d8de67e101c33573.tar.gz | |
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
Diffstat (limited to 'ext/curl/multi.c')
0 files changed, 0 insertions, 0 deletions