]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d42fa2a 813e867)
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 00:41:04 +0000 (17:41 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 00:41:04 +0000 (17:41 -0700)
* PHP-5.4:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks

1  2 
sapi/fpm/fpm/fastcgi.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fastcgi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.