Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory

3 files changed, 0 insertions, 3 deletions

diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
index dcc9e43f42..d7e4705abb 100644
--- a/sapi/fpm/fpm/fpm_scoreboard.c
+++ b/sapi/fpm/fpm/fpm_scoreboard.c
@@ -62,7 +62,6 @@ int fpm_scoreboard_init_main() /* {{{ */
 			if (!wp->scoreboard->procs[i]) {
 				return -1;
 			}
-			memset(wp->scoreboard->procs[i], 0, sizeof(struct fpm_scoreboard_proc_s));
 		}
 
 		wp->scoreboard->pm = wp->config->pm;
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
index 9226adf3d3..7986056793 100644
--- a/sapi/fpm/fpm/fpm_shm.c
+++ b/sapi/fpm/fpm/fpm_shm.c
@@ -35,7 +35,6 @@ void *fpm_shm_alloc(size_t size) /* {{{ */
 		return NULL;
 	}
 
-	memset(mem, 0, size);
 	fpm_shm_size += size;
 	return mem;
 }
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
index 41a1715d07..125edac9a8 100644
--- a/sapi/litespeed/lsapilib.c
+++ b/sapi/litespeed/lsapilib.c
@@ -2639,7 +2639,6 @@ static int lsapi_init_children_status()
         perror( "Anonymous mmap() failed" );
         return -1;
     }
-    memset( pBuf, 0, size );
     g_prefork_server->m_pChildrenStatus = (lsapi_child_status *)pBuf;
     g_prefork_server->m_pChildrenStatusCur = (lsapi_child_status *)pBuf;
     g_prefork_server->m_pChildrenStatusEnd = (lsapi_child_status *)pBuf + size / sizeof( lsapi_child_status );