]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 03:08:37 +0000 (19:08 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 03:08:37 +0000 (19:08 -0800)
commit237128603f99a97da9d0d261b8d0849f27b4c7b8
treeb22950edbec46949e587be43acc15fa4100bd5e1
parentc8a12508c748a546d9dab14b3eb2c4a94ca279cc
parent0f9c708229d7d4f4eff96c30cff7a2339f738511
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
ext/standard/dns.c
main/network.c
sapi/cgi/fastcgi.c