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

diff --git a/build/build-modules-c.awk b/build/build-modules-c.awk
index db35c75f69f0e8a1160bf998f59fa897689c9a58..15ff82ccfb4f75ca788db078240b62875f22ed58 100644 (file)
--- a/build/build-modules-c.awk
+++ b/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 ""

diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 6b348f5e24fc339825b0e7e6b07732b9dbed49f8..f0ed282b7a0b7433cf4071b66f21655ec268f776 100644 (file)
--- a/modules/aaa/mod_auth.c
+++ b/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"

diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index d622c93de59d966177ff4da31b9b59b41d830550..dabe5d1739c7f2595546897e03ea1f6820808fbb 100644 (file)
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -1,3 +1,4 @@
+#include "ap_config.h"
 #include "ap_mmn.h"
 #include "httpd.h"
 #include "http_config.h"

diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index 0dd6fed3b43a13a3f6d0b2ea3f67c64a459ad2f0..4ad6cf67994c94a02372686d6397704694885bbd 100644 (file)
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -55,6 +55,7 @@
  *
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_protocol.h"

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 4849f77540012831c8e30a05bf058402262a7f00..b110b87dc8372c85f84980574287ce7ae28645d4 100644 (file)
--- a/modules/http/http_core.c
+++ b/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

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 76b1386b5a2625952b26857b553ae4477aab096a..56bab15cd9bc999323d4b6f66c3b0a0a64d39df1 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/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)

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 74608b2a141c4929c8521ae4a597f5a9cd976413..add4a9ec9663d04a24b9960dd47001335c6688a0 100644 (file)
--- a/modules/http/http_request.c
+++ b/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)

diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index 10051f0a84f2da7352067e9d88903780e24a1e08..abf9318252c1a3e2ae45182babce3ca580647377 100644 (file)
--- a/modules/mappers/mod_actions.c
+++ b/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"

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 867b126f64c0cd6e10fe72ed8357805aa0ccaac4..d2f31792263f7a0db7ead398eefff4568397f87f 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/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;

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index f87139fbe83944221dbd9177840fd94eebca5da5..bff9b3b0d4240cb1c46790d22d568dcb6fb673f5 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/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"

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 14a475f72bd161b346c2540a95624d7cf60d1bb8..01e5e6ac38aeed1d05f945663c8df5387d5c3341 100644 (file)
--- a/modules/metadata/mod_setenvif.c
+++ b/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,

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 4748e93242c27f70898bffc94f4f49ec0f5c9ed0..2eaa13008b9bfe67c6ca03755a2c9eab06c04a1b 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -55,6 +55,7 @@
  *
  */
 
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_main.h"

diff --git a/server/config.c b/server/config.c
index 09faae67e2663ce6482ba105c678cc6dfb399d53..fbb7c93a6f3b1f218284da699310a5bf9994010c 100644 (file)
--- a/server/config.c
+++ b/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)

diff --git a/server/connection.c b/server/connection.c
index 11d49d0d57928871bacd9bb7ba4b145a9bc33fd3..3a94d1402070253c6f5fd2e77a53afb201f38d40 100644 (file)
--- a/server/connection.c
+++ b/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)

diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index dc33a73d86bf7a53c48b1b8f063e60b8cdf908d2..b27f38f2dd20aed4271189996a654d9c7fcc8450 100644 (file)
--- a/server/gen_test_char.c
+++ b/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.

diff --git a/server/listen.c b/server/listen.c
index 6ae1ba20f561d28f605c65436f91411824807a6b..478ddbed400b54709c67f304599eb0d24f8e8e89 100644 (file)
--- a/server/listen.c
+++ b/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"

diff --git a/server/main.c b/server/main.c
index 06fee1b5a794275772278add2e02e24054b51a5d..dc3110247a262dfe6462dc6dd33f55c4b34622b2 100644 (file)
--- a/server/main.c
+++ b/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;
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index b3d0957d3ce3c35255fb11c971a19aecc097eb40..05a0fe27e7afa9c19fefdedf7e6912a2c87b4911 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/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, 

diff --git a/server/rfc1413.c b/server/rfc1413.c
index 604d1ac044930bb04ed9fe53201831337411654a..80ceb19eec65a5ebd1a9b1e694e989a22f7a263c 100644 (file)
--- a/server/rfc1413.c
+++ b/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"

diff --git a/server/util.c b/server/util.c
index bef1792e19246926ee7de74fa1195695299194f3..19458e556b9c6e68f86e6b1ae0103a3442fdc481 100644 (file)
--- a/server/util.c
+++ b/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 *);

diff --git a/server/util_md5.c b/server/util_md5.c
index ed6432c2a48c672206603f3a6f68cc7fce11e0c0..3b71c15ee9eb8963463dac79efdda7ed97de1a04 100644 (file)
--- a/server/util_md5.c
+++ b/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"

diff --git a/server/util_script.c b/server/util_script.c
index a44a0e47962ba1a0661d456053abf062dcb48576..f5c1fc1e2c3e74ee808a34d58b2618955b9748bf 100644 (file)
--- a/server/util_script.c
+++ b/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>
 

diff --git a/server/util_uri.c b/server/util_uri.c
index afc6adbc1ee0c502816061596123df635dd5659f..0e5102955e3c5e2351d3315cd45c0f4c4d0772b5 100644 (file)
--- a/server/util_uri.c
+++ b/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 */

diff --git a/server/vhost.c b/server/vhost.c
index 47eebf7cf511755c6e5285c8dc65f270b982d58a..7b8574bd123c33219e82160dd0231d53805a0a6c 100644 (file)
--- a/server/vhost.c
+++ b/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