rbb 00/01/28 10:02:32
Modified: src/ap ap_hooks.c ap_sha1.c src/helpers build-modules-c.awk src/main buff.c gen_test_char.c http_config.c http_connection.c http_core.c http_main.c http_protocol.c http_request.c http_vhost.c iol_file.c listen.c rfc1413.c util.c util_md5.c util_script.c util_uri.c src/modules/mpm/prefork prefork.c src/modules/standard mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_dir.c mod_echo.c mod_setenvif.c src/os/unix iol_socket.c unixd.c Log: Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files. Revision Changes Path 1.10 +1 -0 apache-2.0/src/ap/ap_hooks.c Index: ap_hooks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ap_hooks.c 2000/01/19 01:14:22 1.9 +++ ap_hooks.c 2000/01/28 18:00:33 1.10 @@ -1,3 +1,4 @@ +#include "ap_config.h" #include "httpd.h" #include "ap_hooks.h" #include <assert.h> 1.4 +1 -1 apache-2.0/src/ap/ap_sha1.c Index: ap_sha1.c =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ap_sha1.c 2000/01/19 01:14:22 1.3 +++ ap_sha1.c 2000/01/28 18:00:35 1.4 @@ -84,13 +84,13 @@ #include <string.h> +#include "ap_config.h" #include "httpd.h" #include "ap_sha1.h" #include "ap.h" #ifdef CHARSET_EBCDIC #include "ebcdic.h" #endif /*CHARSET_EBCDIC*/ -#include "ap_config.h" /* a bit faster & bigger, if defined */ #define UNROLL_LOOPS 1.3 +1 -0 apache-2.0/src/helpers/build-modules-c.awk Index: build-modules-c.awk =================================================================== RCS file: /home/cvs/apache-2.0/src/helpers/build-modules-c.awk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build-modules-c.awk 1999/12/19 16:36:49 1.2 +++ build-modules-c.awk 2000/01/28 18:00:46 1.3 @@ -17,6 +17,7 @@ print " * configuration script. DO NOT HAND EDIT!!!!!" print " */" print "" + print "#include \"ap_config.h\"" print "#include \"httpd.h\"" print "#include \"http_config.h\"" print "" 1.29 +1 -1 apache-2.0/src/main/buff.c Index: buff.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/buff.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- buff.c 2000/01/23 16:37:39 1.28 +++ buff.c 2000/01/28 18:00:58 1.29 @@ -55,10 +55,10 @@ * */ +#include "ap_config.h" #include "httpd.h" #include "http_main.h" #include "http_log.h" -#include "ap_config.h" #include <stdio.h> #include <stdarg.h> 1.2 +1 -0 apache-2.0/src/main/gen_test_char.c Index: gen_test_char.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gen_test_char.c 1999/08/24 06:45:18 1.1 +++ gen_test_char.c 2000/01/28 18:01:04 1.2 @@ -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. 1.24 +1 -1 apache-2.0/src/main/http_config.c Index: http_config.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- http_config.c 2000/01/19 01:15:02 1.23 +++ http_config.c 2000/01/28 18:01:06 1.24 @@ -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) 1.26 +1 -1 apache-2.0/src/main/http_connection.c Index: http_connection.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- http_connection.c 2000/01/19 01:15:03 1.25 +++ http_connection.c 2000/01/28 18:01:09 1.26 @@ -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) 1.34 +1 -1 apache-2.0/src/main/http_core.c Index: http_core.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- http_core.c 2000/01/19 02:09:01 1.33 +++ http_core.c 2000/01/28 18:01:11 1.34 @@ -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 1.27 +1 -1 apache-2.0/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- http_main.c 2000/01/19 01:15:07 1.26 +++ http_main.c 2000/01/28 18:01:14 1.27 @@ -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; 1.52 +1 -1 apache-2.0/src/main/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- http_protocol.c 2000/01/27 05:57:47 1.51 +++ http_protocol.c 2000/01/28 18:01:16 1.52 @@ -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) 1.19 +1 -1 apache-2.0/src/main/http_request.c Index: http_request.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- http_request.c 2000/01/26 07:07:49 1.18 +++ http_request.c 2000/01/28 18:01:20 1.19 @@ -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) 1.14 +1 -1 apache-2.0/src/main/http_vhost.c Index: http_vhost.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- http_vhost.c 2000/01/26 07:07:49 1.13 +++ http_vhost.c 2000/01/28 18:01:23 1.14 @@ -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 1.7 +1 -0 apache-2.0/src/main/iol_file.c Index: iol_file.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- iol_file.c 2000/01/19 01:15:12 1.6 +++ iol_file.c 2000/01/28 18:01:26 1.7 @@ -55,6 +55,7 @@ * */ +#include "ap_config.h" #include "httpd.h" #include "ap_iol.h" #include <malloc.h> 1.19 +1 -0 apache-2.0/src/main/listen.c Index: listen.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/listen.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- listen.c 2000/01/19 01:15:13 1.18 +++ listen.c 2000/01/28 18:01:29 1.19 @@ -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" 1.11 +1 -0 apache-2.0/src/main/rfc1413.c Index: rfc1413.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rfc1413.c 2000/01/19 01:15:13 1.10 +++ rfc1413.c 2000/01/28 18:01:31 1.11 @@ -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" 1.29 +1 -1 apache-2.0/src/main/util.c Index: util.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/util.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- util.c 2000/01/26 07:40:11 1.28 +++ util.c 2000/01/28 18:01:35 1.29 @@ -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 *); 1.8 +1 -0 apache-2.0/src/main/util_md5.c Index: util_md5.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- util_md5.c 1999/12/19 10:05:10 1.7 +++ util_md5.c 2000/01/28 18:01:39 1.8 @@ -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" 1.25 +1 -1 apache-2.0/src/main/util_script.c Index: util_script.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- util_script.c 2000/01/23 16:37:40 1.24 +++ util_script.c 2000/01/28 18:01:42 1.25 @@ -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> 1.6 +1 -1 apache-2.0/src/main/util_uri.c Index: util_uri.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- util_uri.c 2000/01/21 19:13:24 1.5 +++ util_uri.c 2000/01/28 18:01:45 1.6 @@ -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 */ 1.66 +1 -1 apache-2.0/src/modules/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- prefork.c 2000/01/19 01:15:57 1.65 +++ prefork.c 2000/01/28 18:02:08 1.66 @@ -1025,7 +1025,7 @@ * 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, 1.6 +1 -0 apache-2.0/src/modules/standard/mod_actions.c Index: mod_actions.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_actions.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_actions.c 2000/01/06 14:43:37 1.5 +++ mod_actions.c 2000/01/28 18:02:12 1.6 @@ -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" 1.5 +1 -1 apache-2.0/src/modules/standard/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_alias.c 2000/01/23 16:37:43 1.4 +++ mod_alias.c 2000/01/28 18:02:13 1.5 @@ -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; 1.16 +1 -0 apache-2.0/src/modules/standard/mod_asis.c Index: mod_asis.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_asis.c 2000/01/18 23:41:51 1.15 +++ mod_asis.c 2000/01/28 18:02:14 1.16 @@ -55,6 +55,7 @@ * */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_protocol.h" 1.13 +1 -0 apache-2.0/src/modules/standard/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_auth.c 1999/11/23 13:47:01 1.12 +++ mod_auth.c 2000/01/28 18:02:16 1.13 @@ -69,6 +69,7 @@ * no control is passed along. */ +#include "ap_config.h" #include "apr_md5.h" #include "httpd.h" #include "http_config.h" 1.7 +1 -0 apache-2.0/src/modules/standard/mod_dir.c Index: mod_dir.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_dir.c 2000/01/18 23:41:53 1.6 +++ mod_dir.c 2000/01/28 18:02:18 1.7 @@ -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" 1.16 +1 -0 apache-2.0/src/modules/standard/mod_echo.c Index: mod_echo.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_echo.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_echo.c 2000/01/18 23:41:53 1.15 +++ mod_echo.c 2000/01/28 18:02:19 1.16 @@ -1,3 +1,4 @@ +#include "ap_config.h" #include "ap_mmn.h" #include "httpd.h" #include "http_config.h" 1.6 +1 -1 apache-2.0/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_setenvif.c 2000/01/23 16:37:43 1.5 +++ mod_setenvif.c 2000/01/28 18:02:21 1.6 @@ -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, 1.15 +1 -0 apache-2.0/src/os/unix/iol_socket.c Index: iol_socket.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- iol_socket.c 2000/01/26 05:01:13 1.14 +++ iol_socket.c 2000/01/28 18:02:28 1.15 @@ -57,6 +57,7 @@ #define CORE_PRIVATE +#include "ap_config.h" #include "httpd.h" #include "ap_iol.h" #include "apr_network_io.h" 1.9 +1 -0 apache-2.0/src/os/unix/unixd.c Index: unixd.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- unixd.c 2000/01/19 01:16:23 1.8 +++ unixd.c 2000/01/28 18:02:29 1.9 @@ -55,6 +55,7 @@ * */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_main.h"