diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 19:12:00 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 19:12:20 -0800 |
| commit | 41bdd6e7cc7671b1c000261a3ccb73411732ce2b (patch) | |
| tree | 1de213b59180b4a7d5029b4731bff6e1785bbc72 /main/php_network.h | |
| parent | d9a9afa4990ede4be6dd4084b8ab550779be4f15 (diff) | |
| parent | 882a375dbad4ecb1fddd9dd80f1a1350299629c1 (diff) | |
| download | php-git-41bdd6e7cc7671b1c000261a3ccb73411732ce2b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925)
Add mitigation for CVE-2015-0235 (bug #68925)
Diffstat (limited to 'main/php_network.h')
0 files changed, 0 insertions, 0 deletions