]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJulien Pauli <jpauli@php.net>
Mon, 11 Jul 2016 12:59:24 +0000 (14:59 +0200)
committerJulien Pauli <jpauli@php.net>
Mon, 11 Jul 2016 12:59:24 +0000 (14:59 +0200)
* PHP-7.0:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory

1  2 
sapi/fpm/fpm/fpm_scoreboard.c
sapi/litespeed/lsapilib.c

Simple merge
Simple merge