diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:39:26 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:39:49 -0800 |
| commit | 720ba679485cb7120911af8013b7b6ab72a47884 (patch) | |
| tree | 494eca3623429aa0b45874830f25bb4d206f133e /ext/curl/multi.c | |
| parent | 4675b79e65e7eea3f3e6343236e1c5ed335d88bf (diff) | |
| parent | f7eedbe9a685d6047dc04b29121980c2c6773251 (diff) | |
| download | php-git-720ba679485cb7120911af8013b7b6ab72a47884.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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
Diffstat (limited to 'ext/curl/multi.c')
0 files changed, 0 insertions, 0 deletions