]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 05:48:40 +0000 (21:48 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 05:48:40 +0000 (21:48 -0800)
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

1  2 
sapi/litespeed/lsapilib.c

Simple merge