]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Mon, 11 Jul 2016 12:58:55 +0000 (14:58 +0200)
committerJulien Pauli <jpauli@php.net>
Mon, 11 Jul 2016 12:58:55 +0000 (14:58 +0200)
commitfc2c301fe266c0a2e36ffb07fdc6aea6ca1916a3
tree462595efb8aed7b893439de25c33cf616e94647e
parent7759d6b0db0437195442ea2d43e1a49001ef23a7
parent2552cf248d6d0e84010f625d89398dfc0b835ef0
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
sapi/fpm/fpm/fpm_scoreboard.c
sapi/litespeed/lsapilib.c