Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is

defined correctly in all C files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84531 13f79535-47bb-0310-9956-ffa450edef68

build/build-modules-c.awk

@@ -17,6 +17,7 @@ END {
     print " * configuration script.  DO NOT HAND EDIT!!!!!"
     print " */"
     print ""
+    print "#include \"ap_config.h\""
     print "#include \"httpd.h\""
     print "#include \"http_config.h\""
     print ""

modules/aaa/mod_auth.c

@@ -69,6 +69,7 @@
  *         no control is passed along.
  */
 
+#include "ap_config.h"
 #include "apr_md5.h"
 #include "httpd.h"
 #include "http_config.h"

modules/echo/mod_echo.c

@@ -1,3 +1,4 @@
+#include "ap_config.h"
 #include "ap_mmn.h"
 #include "httpd.h"
 #include "http_config.h"

modules/generators/mod_asis.c

@@ -55,6 +55,7 @@
  *
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_protocol.h"

modules/http/http_core.c

@@ -56,6 +56,7 @@
  */
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "apr_lib.h"
 #include "httpd.h"
 #include "http_config.h"
@@ -69,7 +70,6 @@
 #include "util_md5.h"
 #include "apr_fnmatch.h"
 #include "http_connection.h"
-#include "ap_config.h"
 
 /* Allow Apache to use ap_mmap */
 #ifdef USE_MMAP_FILES

modules/http/http_protocol.c

@@ -63,6 +63,7 @@
  */
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -75,7 +76,6 @@
 #include "util_date.h"          /* For parseHTTPdate and BAD_DATE */
 #include "mpm_status.h"
 #include <stdarg.h>
-#include "ap_config.h"
 
 HOOK_STRUCT(
 	    HOOK_LINK(post_read_request)

modules/http/http_request.c

@@ -66,6 +66,7 @@
  */
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
@@ -74,7 +75,6 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "apr_fnmatch.h"
-#include "ap_config.h"
 
 HOOK_STRUCT(
 	    HOOK_LINK(translate_name)

modules/mappers/mod_actions.c

@@ -77,6 +77,7 @@
  * URI includes query information (stuff after a ?-mark).
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"

modules/mappers/mod_alias.c

@@ -63,10 +63,10 @@
  * 
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
-#include "ap_config.h"
 
 typedef struct {
     char *real;

modules/mappers/mod_dir.c

@@ -59,6 +59,7 @@
  * mod_dir.c: handle default index files, and trailing-/ redirects
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"

modules/metadata/mod_setenvif.c

@@ -114,12 +114,12 @@
  *    SetEnvIf remote_addr (127.0.0.1|192.168.10.) LOCAL
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#include "ap_config.h"
 
 enum special {
     SPECIAL_NOT,

os/unix/unixd.c

@@ -55,6 +55,7 @@
  *
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_main.h"

server/config.c

@@ -72,6 +72,7 @@
 
 #define CORE_PRIVATE
 
+#include "ap_config.h"
 #include "apr_portable.h"
 #include "apr_file_io.h"
 #include "httpd.h"
@@ -81,7 +82,6 @@
 #include "http_request.h"	/* for default_handler (see invoke_handler) */
 #include "http_main.h"
 #include "http_vhost.h"
-#include "ap_config.h"
 
 HOOK_STRUCT(
 	    HOOK_LINK(header_parser)

server/connection.c

@@ -56,6 +56,7 @@
  */ 
  
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_connection.h"
 #include "http_request.h"
@@ -64,7 +65,6 @@
 #include "mpm_status.h"
 #include "http_config.h"
 #include "http_vhost.h"
-#include "ap_config.h"
 
 HOOK_STRUCT(
 	    HOOK_LINK(pre_connection)

server/gen_test_char.c

@@ -1,4 +1,5 @@
 /* we need some of the portability definitions... for strchr */
+#include "ap_config.h"
 #include "httpd.h"
 
 /* A bunch of functions in util.c scan strings looking for certain characters.

server/listen.c

@@ -58,6 +58,7 @@
 #include "apr_network_io.h"
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "ap_listen.h"

server/main.c

@@ -56,6 +56,7 @@
  */ 
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h" 
 #include "http_main.h" 
 #include "http_log.h" 
@@ -63,7 +64,6 @@
 #include "util_uri.h" 
 #include "apr_getopt.h"
 #include "ap_mpm.h"
-#include "ap_config.h"
 
 const char *ap_server_argv0;
 

server/mpm/prefork/prefork.c

@@ -1025,7 +1025,7 @@ static void reopen_scoreboard(ap_context_t *p)
  * this #ifdef section must be ABOVE the next one (BSD style).
  *
  * I tested this stuff and it works fine for me, but if it provides 
- * trouble for you, just comment out USE_MMAP_SCOREBOARD in QNX section
+ * trouble foR YOU, JUst comment out USE_MMAP_SCOREBOARD in QNX section
  * of ap_config.h
  *
  * June 5, 1997, 

server/rfc1413.c

@@ -78,6 +78,7 @@
 
 /* Rewritten by David Robinson */
 
+#include "ap_config.h"
 #include "httpd.h"		/* for server_rec, conn_rec, etc. */
 #include "http_log.h"		/* for aplog_error */
 #include "rfc1413.h"

server/util.c

@@ -70,11 +70,11 @@
 
 #define CORE_PRIVATE
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_main.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#include "ap_config.h"
 #if defined(SUNOS4)
 /* stdio.h has been read in ap_config.h already. Add missing prototypes here: */
 extern int fgetc(FILE *);

server/util_md5.c

@@ -84,6 +84,7 @@
 /* md5.c --Module Interface to MD5. */
 /* Jeff Hostetler, Spyglass, Inc., 1994. */
 
+#include "ap_config.h"
 #include "apr_portable.h"
 #include "httpd.h"
 #include "util_md5.h"

server/util_script.c

@@ -56,6 +56,7 @@
  */
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_main.h"
@@ -65,7 +66,6 @@
 #include "http_request.h"	/* for sub_req_lookup_uri() */
 #include "util_script.h"
 #include "util_date.h"		/* For parseHTTPdate() */
-#include "ap_config.h"
 #include <stdlib.h>
 #include <string.h>
 

server/util_uri.c

@@ -59,11 +59,11 @@
  * 
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_log.h"
 #include "util_uri.h"
 #include <string.h>
-#include "ap_config.h"
 
 /* Some WWW schemes and their default ports; this is basically /etc/services */
 /* This will become global when the protocol abstraction comes */

server/vhost.c

@@ -61,13 +61,13 @@
  */
 
 #define CORE_PRIVATE
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
 #include "http_vhost.h"
 #include "http_protocol.h"
 #include "http_core.h"
-#include "ap_config.h"
 
 /*
  * After all the definitions there's an explanation of how it's all put