1 files changed, 31 insertions, 21 deletions
diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index a878b8fa3e..6d41f418ab 100644
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -1,24 +1,34 @@
-# if HAVE_AP_CONFIG_H
-#include "ap_config_auto.h"
-#ifdef RHAPSODY
-#undef HAVE_SNPRINTF
+#define NO_REGEX_EXTRA_H
+
+#ifdef WIN32
+#include <winsock2.h>
+#include <stddef.h>
 #endif
-#include "ap_config.h"
-#ifdef RHAPSODY
-#undef HAVE_SNPRINTF   
-#define HAVE_SNPRINTF 1
-#endif 
-# endif
-# if HAVE_OLD_COMPAT_H
-#include "compat.h"
-# endif
-# if HAVE_AP_COMPAT_H 
-#include "ap_compat.h"
-# endif
+
+#include "zend.h"
+#include "php_regex.h"
+
 #include "httpd.h"
-#include "http_main.h"    
-#include "http_core.h"    
-#include "http_request.h" 
-#include "http_protocol.h"
 #include "http_config.h"
-#include "http_log.h"
+
+#if MODULE_MAGIC_NUMBER > 19980712
+# include "ap_compat.h"
+#else
+# if MODULE_MAGIC_NUMBER > 19980324
+#  include "compat.h"
+# endif
+#endif
+
+#include "http_core.h"
+#include "http_main.h"
+#include "http_protocol.h"
+#include "http_request.h"
+#include "http_log.h"   
+#include "util_script.h"
+
+#include "php_variables.h"
+#include "php_main.h"     
+#include "php_ini.h"
+#include "ext/standard/php_standard.h"
+
+#include "mod_php4.h"