Don't include system headers in php_config.h

Configuration headers (config.h, etc.), as their name implies, are
supposed to contain macro definitions to avoid having them to pass
on the command line[1].  It seems fine if they include other
configuration headers when needed.  In any way, they are supposed to be
included very early in compilation units which require them.

Doing more than defining simple macros, possibly guarded by defines set
during compile time (such as a compiler or platform identification),
can lead to subtle issues, which may go unnoticed such as the fallback
definitions in the hard-coded (!) fpm_config.h, which may actually be
used unconditionally, because the appropriate system headers have not
already been included.

[1] <https://www.gnu.org/software/autoconf/manual/autoconf-2.72/html_node/Configuration-Headers.html>

Author: cmb69

TSRM/TSRM.h

@@ -16,8 +16,27 @@
 #if !defined(__CYGWIN__) && defined(_WIN32)
 # define TSRM_WIN32
 # include <Zend/zend_config.w32.h>
+# define _CRTDBG_MAP_ALLOC
+# include <malloc.h>
+# include <stdlib.h>
+# include <crtdbg.h>
+# include <string.h>
+# ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <winsock2.h>
+# include <windows.h>
+# include <float.h>
 #else
 # include <main/php_config.h>
+# include <stdlib.h>
+# ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+# endif
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+# endif
+# include <string.h>
 #endif
 
 #include <stdint.h>

Zend/zend.h

@@ -24,6 +24,32 @@
 
 #define ZEND_ENGINE_3
 
+#if !defined(__CYGWIN__) && defined(_WIN32)
+# define TSRM_WIN32
+# include <Zend/zend_config.w32.h>
+# define _CRTDBG_MAP_ALLOC
+# include <malloc.h>
+# include <stdlib.h>
+# include <crtdbg.h>
+# include <string.h>
+# ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <winsock2.h>
+# include <windows.h>
+# include <float.h>
+#else
+# include <main/php_config.h>
+# include <stdlib.h>
+# ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+# endif
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+# endif
+# include <string.h>
+#endif
+
 #include "zend_types.h"
 #include "zend_map_ptr.h"
 #include "zend_errors.h"

Zend/zend_config.w32.h

@@ -22,22 +22,6 @@
 
 #include <../main/config.w32.h>
 
-#define _CRTDBG_MAP_ALLOC
-
-#include <malloc.h>
-#include <stdlib.h>
-#include <crtdbg.h>
-
-#include <string.h>
-
-#ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#include <windows.h>
-
-#include <float.h>
-
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif

configure.ac

@@ -43,18 +43,6 @@ AH_TOP([
 #define ZEND_DLIMPORT
 ])
 AH_BOTTOM([
-#include <stdlib.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#include <string.h>
-
 #endif /* PHP_CONFIG_H */
 ])
 

sapi/fpm/fpm/fpm.h

@@ -3,6 +3,7 @@
 #ifndef FPM_H
 #define FPM_H 1
 
+#include <zend.h>
 #include <unistd.h>
 
 #ifdef HAVE_SYSEXITS_H

sapi/fpm/fpm/fpm_events.h

@@ -3,6 +3,8 @@
 #ifndef FPM_EVENTS_H
 #define FPM_EVENTS_H 1
 
+#include <zend.h>
+
 #define FPM_EV_TIMEOUT  (1 << 0)
 #define FPM_EV_READ     (1 << 1)
 #define FPM_EV_PERSIST  (1 << 2)