rse 98/07/13 04:33:00
Modified: src CHANGES Configure Makefile.tmpl buildmark.c
src/ap Makefile.tmpl
src/include .cvsignore ap_compat.h ap_config.h ap_ctype.h
compat.h conf.h fnmatch.h http_config.h httpd.h
src/main Makefile.tmpl fnmatch.c http_core.c http_main.c
md5c.c rfc1413.c util.c util_date.c
src/modules/example Makefile.tmpl
src/modules/experimental Makefile.tmpl
src/modules/proxy Makefile.tmpl
src/modules/standard Makefile.tmpl mod_rewrite.h
src/os/bs2000 ebcdic.c os-inline.c os.h
src/os/emx os-inline.c
src/os/unix Makefile.tmpl os-inline.c os.c os.h
src/os/win32 multithread.c os.h
src/regex engine.c engine.ih regcomp.c regcomp.ih
regerror.ih
src/support Makefile.tmpl ab.c htdigest.c htpasswd.c
logresolve.c rotatelogs.c suexec.c
Removed: src/include apctype.h
Log:
Global renaming of C header files to both get rid of conflicts with third
party packages and to again reach consistency:
Visible changes
---------------
1. conf.h -> ap_config.h:
conflicted with conf.h files from 3rd party packages like SSLeay For
backward compatibility a conf.h is still present but only holding an
#include for ap_config.h.
2. conf_auto.h -> ap_config_auto.h
to be consistent with conf.h rename because this belongs to ap_config.h.
To backward compatibility needed because invented only a few days ago.
3. ap_config.h -> ap_config_auto.h
this recently introduced header contains autogenerated defines similar to
conf_auto.h, so provide them in ap_config_auto.h, too. Backward
compatibility is provided because ap_config.h (now the contents of conf.h)
already includes ap_config_auto.h.
4. compat.h -> ap_compat.h:
conflicted with compat.h files from 3rd party packages. For backward
compatibility a compat.h is still present but only holding an #include for
ap_compat.h.
5. apctype.h -> ap_ctype.h:
because Dean missed the newer ap_ naming convention when he comitted it
recently but wants it now this way. To backward compatibility needed
because invented only a few days ago.
Background information
----------------------
o The files were actually not renamed. They were copied (but not moved)
inside the CVS repository and only removed for HEAD. This is important to
both preserve the history with the new files and to be able to checkout
older releases with the old files.
o The MODULE_MAGIC_NUMBER was bumped up because the API changed.
o The backward-compatibility headers were added to the source tree
_after_ all things were changed and anything compiled fine again.
So no dangling references to the old headers in the HEAD sources
should exist. I also verified this via grep.
o The backward-compatibility headers display a warning under GCC indicating
that they are obsolete together with a hint which file should be used
instead. Example:
:> cc -o test test.c
In file included from test.c:2:
conf.h:6: warning: #warning "This header becomes obsolete, use ap_config.h
instead"
In file included from test.c:3:
compat.h:6: warning: #warning "This header becomes obsolete, use
ap_compat.h instead"
o The dependencies in the Makefiles and the "distclean" target in
src/Makefile.tmpl were updated accordingly.
o Some C comments were also changed to now read "ap_config.h" instead
of "conf.h", etc.
Revision Changes Path
1.963 +10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.962
retrieving revision 1.963
diff -u -r1.962 -r1.963
--- CHANGES 1998/07/12 09:35:40 1.962
+++ CHANGES 1998/07/13 11:32:28 1.963
@@ -1,5 +1,15 @@
Changes with Apache 1.3.1
+ *) Global renaming of C header files to both get rid of conflicts with
third
+ party packages and to again reach consistency:
+ 1. conf.h -> ap_config.h
+ 2. conf_auto.h -> ap_config_auto.h \ these are now merged
+ 3. ap_config.h -> ap_config_auto.h / in the config process
+ 4. compat.h -> ap_compat.h
+ 5. apctype.h -> ap_ctype.h
+ Backward compatibility files for conf.h and compat.h were created.
+ [The Apache Group]
+
*) Let mod_mmap_static be more reserved unless at least one "mmapfile"
directive is present in the configuration. Because this experimental
module has to do some black magic to operate inside the current API and
1.276 +28 -24 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- Configure 1998/07/12 13:32:50 1.275
+++ Configure 1998/07/13 11:32:29 1.276
@@ -1205,33 +1205,35 @@
####################################################################
## Now check for existance of non-standard system header files
+## and start generation of the ap_config_auto.h header
##
-echo " + checking for system header files"
+AP_CONFIG_AUTO_H="include/ap_config_auto.h"
+echo "/*" >$AP_CONFIG_AUTO_H
+echo " * ap_config_auto.h -- Automatically determined configuration stuff"
>>$AP_CONFIG_AUTO_H
+echo " * THIS FILE WAS AUTOMATICALLY GENERATED - DO NOT EDIT!"
>>$AP_CONFIG_AUTO_H
+echo " */" >>$AP_CONFIG_AUTO_H
+echo "" >>$AP_CONFIG_AUTO_H
+echo "#ifndef AP_CONFIG_AUTO_H" >>$AP_CONFIG_AUTO_H
+echo "#define AP_CONFIG_AUTO_H" >>$AP_CONFIG_AUTO_H
-CONF_AUTO_H="include/conf_auto.h"
+echo " + checking for system header files"
CHECK_FOR_HEADERS="dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h
sys/select.h sys/processor.h"
-
-echo "/* Automatically generated file - DO NOT EDIT */" >$CONF_AUTO_H
-echo "#ifndef APACHE_CONF_AUTO_H" >>$CONF_AUTO_H
-echo "#define APACHE_CONF_AUTO_H 1" >>$CONF_AUTO_H
-echo "" >>$CONF_AUTO_H
for header in $CHECK_FOR_HEADERS; do
- echo "/* <$header> */" >>$CONF_AUTO_H
+ echo "" >>$AP_CONFIG_AUTO_H
+ echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`"
if ./helpers/TestCompile header $header; then
eval "HAVE_${name}=1"
- echo "#ifndef HAVE_${name}" >>$CONF_AUTO_H
- echo "#define HAVE_${name} 1" >>$CONF_AUTO_H
- echo "#endif" >>$CONF_AUTO_H
+ echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
+ echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
+ echo "#endif" >>$AP_CONFIG_AUTO_H
else
eval "HAVE_${name}=0"
- echo "#ifdef HAVE_${name}" >>$CONF_AUTO_H
- echo "#undef HAVE_${name}" >>$CONF_AUTO_H
- echo "#endif" >>$CONF_AUTO_H
+ echo "#ifdef HAVE_${name}" >>$AP_CONFIG_AUTO_H
+ echo "#undef HAVE_${name}" >>$AP_CONFIG_AUTO_H
+ echo "#endif" >>$AP_CONFIG_AUTO_H
fi
- echo "" >>$CONF_AUTO_H
done
-echo "#endif /* APACHE_CONF_AUTO_H */" >>$CONF_AUTO_H
# SOCKS4 support:
# We assume that if they are using SOCKS4, then they've
@@ -1660,25 +1662,27 @@
echo "" >> Makefile.config
####################################################################
-## Continue building include/ap_config.h
+## Finish building ap_config_auto.h
##
-## We pick out all -D's from CFLAGS and create ap_config.h which
-## can be used by external modules needing to include Apache
-## header files.
+## We pick out all -D's from CFLAGS and insert them as defines into
+## ap_config_auto.h so they are available to external modules needing to
+## include Apache header files.
##
for cflag in $CFLAGS; do
echo $cflag | sed 's/\\\"/\"/g' >>$tmpconfig ;
done
-awk > include/ap_config.h < $tmpconfig '
- BEGIN {
- printf "/* Automatically generated file - do not edit */\n\n"
- }
+awk >>$AP_CONFIG_AUTO_H <$tmpconfig '
/^-D.*/ {
define = substr($1, 3, length($1)-2)
split(define, parts, "=")
+ printf ("\n/* build flag: %s */\n", $0)
printf ("#ifndef %s\n#define %s %s\n#endif\n",
parts[1],parts[1],parts[2])
}
'
+
+# finish header file
+echo "" >>$AP_CONFIG_AUTO_H
+echo "#endif /* AP_CONFIG_AUTO_H */" >>$AP_CONFIG_AUTO_H
####################################################################
## Use TestCompile to see if $(CC) is ANSI and as a "final" sanity
1.101 +8 -8 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile.tmpl 1998/07/12 09:19:09 1.100
+++ Makefile.tmpl 1998/07/13 11:32:29 1.101
@@ -80,8 +80,7 @@
( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit
1; \
echo "<=== $(SDP)$$i"; \
done
- -rm -f include/ap_config.h
- -rm -f include/conf_auto.h
+ -rm -f include/ap_config_auto.h
-rm -f modules.c
-rm -f modules/Makefile
-rm -f regex/Makefile
@@ -112,9 +111,10 @@
$(OBJS): Makefile
# DO NOT REMOVE
-buildmark.o: buildmark.c include/conf.h include/conf_auto.h \
- os/unix/os.h include/apctype.h include/httpd.h include/alloc.h \
- include/buff.h include/ap.h include/util_uri.h
-modules.o: modules.c include/httpd.h include/conf.h \
- include/conf_auto.h os/unix/os.h include/apctype.h include/alloc.h \
- include/buff.h include/ap.h include/util_uri.h include/http_config.h
+buildmark.o: buildmark.c include/ap_config.h include/ap_config_auto.h \
+ os/unix/os.h include/ap_ctype.h include/hsregex.h include/httpd.h \
+ include/alloc.h include/buff.h include/ap.h include/util_uri.h
+modules.o: modules.c include/httpd.h include/ap_config.h \
+ include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \
+ include/hsregex.h include/alloc.h include/buff.h include/ap.h \
+ include/util_uri.h include/http_config.h
1.8 +1 -1 apache-1.3/src/buildmark.c
Index: buildmark.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/buildmark.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildmark.c 1998/05/07 12:24:23 1.7
+++ buildmark.c 1998/07/13 11:32:29 1.8
@@ -55,7 +55,7 @@
*
*/
-#include "conf.h"
+#include "ap_config.h"
#include "httpd.h"
#if defined(__DATE__) && defined(__TIME__)
1.27 +20 -20 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.tmpl 1998/07/12 09:19:13 1.26
+++ Makefile.tmpl 1998/07/13 11:32:32 1.27
@@ -39,23 +39,23 @@
&& rm Makefile.new
# DO NOT REMOVE
-ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h
-ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h
-ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h
-ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
-ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h
+ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h
+ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h
+ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h
+ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
+ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h
1.3 +1 -2 apache-1.3/src/include/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1998/07/11 10:24:08 1.2
+++ .cvsignore 1998/07/13 11:32:33 1.3
@@ -1,2 +1 @@
-ap_config.h
-conf_auto.h
+ap_config_auto.h
1.14 +4 -4 apache-1.3/src/include/ap_compat.h
Index: ap_compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_compat.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ap_compat.h 1998/07/09 12:11:35 1.13
+++ ap_compat.h 1998/07/13 11:32:33 1.14
@@ -1,12 +1,12 @@
/*
-** compat.h -- Apache Backward Compatibility
+** ap_compat.h -- Apache Backward Compatibility
**
** INCLUDE THIS HEADER FILE ONLY IF YOU REALLY NEED
** BACKWARD COMPATIBILITY TO OLD APACHE RESOURCES.
*/
-#ifndef APACHE_COMPAT_H
-#define APACHE_COMPAT_H
+#ifndef AP_COMPAT_H
+#define AP_COMPAT_H
#ifdef __cplusplus
extern "C" {
@@ -418,4 +418,4 @@
}
#endif
-#endif /* APACHE_COMPAT_H */
+#endif /* !AP_COMPAT_H */
1.225 +6 -6 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ap_config.h 1998/07/13 09:57:22 1.224
+++ ap_config.h 1998/07/13 11:32:33 1.225
@@ -55,15 +55,15 @@
*
*/
-#ifndef APACHE_CONF_H
-#define APACHE_CONF_H
+#ifndef AP_CONFIG_H
+#define AP_CONFIG_H
#ifdef __cplusplus
extern "C" {
#endif
/*
- * conf.h: system-dependant #defines and includes...
+ * ap_config.h: system-dependant #defines and includes...
* See PORTING for a listing of what they mean
*/
@@ -71,7 +71,7 @@
* Support for platform dependent autogenerated defines
*/
#ifndef WIN32
-#include "conf_auto.h"
+#include "ap_config_auto.h"
#else
/* not available under WIN32, so provide important entries manually */
#undef HAVE_UNISTD_H
@@ -848,7 +848,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "apctype.h"
+#include "ap_ctype.h"
#if !defined(MPE) && !defined(WIN32)
#include <sys/file.h>
#endif
@@ -1174,4 +1174,4 @@
}
#endif
-#endif /* !APACHE_CONF_H */
+#endif /* !AP_CONFIG_H */
1.3 +3 -3 apache-1.3/src/include/ap_ctype.h
Index: ap_ctype.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_ctype.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_ctype.h 1998/07/08 17:57:38 1.2
+++ ap_ctype.h 1998/07/13 11:32:34 1.3
@@ -55,8 +55,8 @@
*
*/
-#ifndef APACHE_APCTYPE_H
-#define APACHE_APCTYPE_H
+#ifndef AP_CTYPE_H
+#define AP_CTYPE_H
#include <ctype.h>
@@ -86,4 +86,4 @@
}
#endif
-#endif /* !APACHE_APCTYPE_H */
+#endif /* !AP_CTYPE_H */
1.14 +5 -416 apache-1.3/src/include/compat.h
Index: compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compat.h 1998/07/09 12:11:35 1.13
+++ compat.h 1998/07/13 11:32:34 1.14
@@ -1,421 +1,10 @@
/*
-** compat.h -- Apache Backward Compatibility
-**
-** INCLUDE THIS HEADER FILE ONLY IF YOU REALLY NEED
-** BACKWARD COMPATIBILITY TO OLD APACHE RESOURCES.
-*/
-
-#ifndef APACHE_COMPAT_H
-#define APACHE_COMPAT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Mapping of Apache 1.2 global symbols to the
- * namespace conflict free variants used in Apache 1.3
+ * compat.h -- backward compatibility header for ap_compat.h
*/
-#define MD5Final ap_MD5Final
-#define MD5Init ap_MD5Init
-#define MD5Update ap_MD5Update
-#define acquire_mutex ap_acquire_mutex
-#define add_cgi_vars ap_add_cgi_vars
-#define add_common_vars ap_add_common_vars
-#define add_module ap_add_module
-#define add_named_module ap_add_named_module
-#define add_per_dir_conf ap_add_per_dir_conf
-#define add_per_url_conf ap_add_per_url_conf
-#define allow_options ap_allow_options
-#define allow_overrides ap_allow_overrides
-#define apapi_get_server_built ap_get_server_built
-#define apapi_get_server_version ap_get_server_version
-#define aplog_error ap_log_error
-#define append_arrays ap_append_arrays
-#define array_cat ap_array_cat
-#define auth_name ap_auth_name
-#define auth_type ap_auth_type
-#define basic_http_header ap_basic_http_header
-#define bclose ap_bclose
-#define bcreate ap_bcreate
-#define bfilbuf ap_bfilbuf
-#define bfileno ap_bfileno
-#define bflsbuf ap_bflsbuf
-#define bflush ap_bflush
-#define bgetc ap_bgetc
-#define bgetflag ap_bgetflag
-#define bgetopt ap_bgetopt
-#define bgets ap_bgets
-#define bhalfduplex ap_bhalfduplex
-#define bind_address ap_bind_address
-#define block_alarms ap_block_alarms
-#define blookc ap_blookc
-#define bnonblock ap_bnonblock
-#define bonerror ap_bonerror
-#define bprintf ap_bprintf
-#define bpushfd ap_bpushfd
-#define bputc ap_bputc
-#define bputs ap_bputs
-#define bread ap_bread
-#define bsetflag ap_bsetflag
-#define bsetopt ap_bsetopt
-#define bskiplf ap_bskiplf
-#define bvputs ap_bvputs
-#define bwrite ap_bwrite
-#define bytes_in_free_blocks ap_bytes_in_free_blocks
-#define bytes_in_pool ap_bytes_in_pool
-#define call_exec ap_call_exec
-#define can_exec ap_can_exec
-#define cfg_closefile ap_cfg_closefile
-#define cfg_getc ap_cfg_getc
-#define cfg_getline ap_cfg_getline
-#define chdir_file ap_chdir_file
-#define check_access ap_check_access
-#define check_alarm ap_check_alarm
-#define check_auth ap_check_auth
-#define check_cmd_context ap_check_cmd_context
-#define check_user_id ap_check_user_id
-#define checkmask ap_checkmask
-#define child_exit_modules ap_child_exit_modules
-#define child_init_modules ap_child_init_modules
-#define child_terminate ap_child_terminate
-#define cleanup_for_exec ap_cleanup_for_exec
-#define clear_module_list ap_clear_module_list
-#define clear_pool ap_clear_pool
-#define clear_table ap_clear_table
-#define close_piped_log ap_close_piped_log
-#define construct_server ap_construct_server
-#define construct_url ap_construct_url
-#define copy_array ap_copy_array
-#define copy_array_hdr ap_copy_array_hdr
-#define copy_table ap_copy_table
-#define core_reorder_directories ap_core_reorder_directories
-#define coredump_dir ap_coredump_dir
-#define count_dirs ap_count_dirs
-#define create_environment ap_create_environment
-#define create_mutex ap_create_mutex
-#define create_per_dir_config ap_create_per_dir_config
-#define create_request_config ap_create_request_config
-#define daemons_limit ap_daemons_limit
-#define daemons_max_free ap_daemons_max_free
-#define daemons_min_free ap_daemons_min_free
-#define daemons_to_start ap_daemons_to_start
-#define day_snames ap_day_snames
-#define default_port ap_default_port
-#define default_port_for_request ap_default_port_for_request
-#define default_port_for_scheme ap_default_port_for_scheme
-#define default_type ap_default_type
-#define destroy_mutex ap_destroy_mutex
-#define destroy_pool ap_destroy_pool
-#define destroy_sub_req ap_destroy_sub_req
-#define die ap_die
-#define discard_request_body ap_discard_request_body
-#define document_root ap_document_root
-#define dummy_mutex ap_dummy_mutex
-#define each_byterange ap_each_byterange
-#define error_log2stderr ap_error_log2stderr
-#define escape_html ap_escape_html
-#define escape_path_segment ap_escape_path_segment
-#define escape_shell_cmd ap_escape_shell_cmd
-#define excess_requests_per_child ap_excess_requests_per_child
-#define exists_scoreboard_image ap_exists_scoreboard_image
-#define finalize_request_protocol ap_finalize_request_protocol
-#define finalize_sub_req_protocol ap_finalize_sub_req_protocol
-#define find_command ap_find_command
-#define find_command_in_modules ap_find_command_in_modules
-#define find_last_token ap_find_last_token
-#define find_linked_module ap_find_linked_module
-#define find_module_name ap_find_module_name
-#define find_path_info ap_find_path_info
-#define find_pool ap_find_pool
-#define find_token ap_find_token
-#define find_types ap_find_types
-#define fini_vhost_config ap_fini_vhost_config
-#define fnmatch ap_fnmatch
-#define force_library_loading ap_force_library_loading
-#define get_basic_auth_pw ap_get_basic_auth_pw
-#define get_client_block ap_get_client_block
-#define get_gmtoff ap_get_gmtoff
-#define get_local_host ap_get_local_host
-#define get_module_config ap_get_module_config
-#define get_remote_host ap_get_remote_host
-#define get_remote_logname ap_get_remote_logname
-#define get_server_name ap_get_server_name
-#define get_server_port ap_get_server_port
-#define get_time ap_get_time
-#define get_token ap_get_token
-#define get_virthost_addr ap_get_virthost_addr
-#define getparents ap_getparents
-#define getword ap_getword
-#define getword_conf ap_getword_conf
-#define getword_conf_nc ap_getword_conf_nc
-#define getword_nc ap_getword_nc
-#define getword_nulls ap_getword_nulls
-#define getword_nulls_nc ap_getword_nulls_nc
-#define getword_white ap_getword_white
-#define getword_white_nc ap_getword_white_nc
-#define gm_timestr_822 ap_gm_timestr_822
-#define gname2id ap_gname2id
-#define group_id ap_group_id
-#define handle_command ap_handle_command
-#define hard_timeout ap_hard_timeout
-#define header_parse ap_header_parse
-#define ht_time ap_ht_time
-#define http_method ap_http_method
-#define ind ap_ind
-#define index_of_response ap_index_of_response
-#define init_alloc ap_init_alloc
-#define init_modules ap_init_modules
-#define init_vhost_config ap_init_vhost_config
-#define init_virtual_host ap_init_virtual_host
-#define internal_redirect ap_internal_redirect
-#define internal_redirect_handler ap_internal_redirect_handler
-#define invoke_handler ap_invoke_handler
-#define is_default_port ap_is_default_port
-#define is_directory ap_is_directory
-#define is_empty_table ap_is_empty_table
-#define is_fnmatch ap_is_fnmatch
-#define is_initial_req ap_is_initial_req
-#define is_matchexp ap_is_matchexp
-#define is_table_empty ap_is_table_empty
-#define is_url ap_is_url
-#define keepalive_timeout ap_keepalive_timeout
-#define kill_cleanup ap_kill_cleanup
-#define kill_cleanups_for_fd ap_kill_cleanups_for_fd
-#define kill_cleanups_for_socket ap_kill_cleanups_for_socket
-#define kill_timeout ap_kill_timeout
-#define limit_section ap_limit_section
-#define listenbacklog ap_listenbacklog
-#define listeners ap_listeners
-#define lock_fname ap_lock_fname
-#define log_assert ap_log_assert
-#define log_error ap_log_error_old
-#define log_pid ap_log_pid
-#define log_printf ap_log_printf
-#define log_reason ap_log_reason
-#define log_transaction ap_log_transaction
-#define log_unixerr ap_log_unixerr
-#define make_array ap_make_array
-#define make_dirstr ap_make_dirstr
-#define make_dirstr_parent ap_make_dirstr_parent
-#define make_dirstr_prefix ap_make_dirstr_prefix
-#define make_full_path ap_make_full_path
-#define make_sub_pool ap_make_sub_pool
-#define make_table ap_make_table
-#define matches_request_vhost ap_matches_request_vhost
-#define max_requests_per_child ap_max_requests_per_child
-#define md5 ap_md5
-#define meets_conditions ap_meets_conditions
-#define merge_per_dir_configs ap_merge_per_dir_configs
-#define month_snames ap_month_snames
-#define no2slash ap_no2slash
-#define note_auth_failure ap_note_auth_failure
-#define note_basic_auth_failure ap_note_basic_auth_failure
-#define note_cleanups_for_fd ap_note_cleanups_for_fd
-#define note_cleanups_for_file ap_note_cleanups_for_file
-#define note_cleanups_for_socket ap_note_cleanups_for_socket
-#define note_digest_auth_failure ap_note_digest_auth_failure
-#define note_subprocess ap_note_subprocess
-#define null_cleanup ap_null_cleanup
-#define open_logs ap_open_logs
-#define open_mutex ap_open_mutex
-#define open_piped_log ap_open_piped_log
-#define os_canonical_filename ap_os_canonical_filename
-#define os_dl_load ap_os_dso_load
-#define os_dl_unload ap_os_dso_unload
-#define os_dl_sym ap_os_dso_sym
-#define os_dl_error ap_os_dso_error
-#define os_escape_path ap_os_escape_path
-#define os_is_path_absolute ap_os_is_path_absolute
-#define overlay_tables ap_overlay_tables
-#define palloc ap_palloc
-#define parseHTTPdate ap_parseHTTPdate
-#define parse_hostinfo_components ap_parse_hostinfo_components
-#define parse_htaccess ap_parse_htaccess
-#define parse_uri ap_parse_uri
-#define parse_uri_components ap_parse_uri_components
-#define parse_vhost_addrs ap_parse_vhost_addrs
-#define pcalloc ap_pcalloc
-#define pcfg_open_custom ap_pcfg_open_custom
-#define pcfg_openfile ap_pcfg_openfile
-#define pclosedir ap_pclosedir
-#define pclosef ap_pclosef
-#define pclosesocket ap_pclosesocket
-#define pduphostent ap_pduphostent
-#define pfclose ap_pfclose
-#define pfdopen ap_pfdopen
-#define pfopen ap_pfopen
-#define pgethostbyname ap_pgethostbyname
-#define pid_fname ap_pid_fname
-#define piped_log_read_fd ap_piped_log_read_fd
-#define piped_log_write_fd ap_piped_log_write_fd
-#define pool_is_ancestor ap_pool_is_ancestor
-#define pool_join ap_pool_join
-#define popendir ap_popendir
-#define popenf ap_popenf
-#define pregcomp ap_pregcomp
-#define pregfree ap_pregfree
-#define pregsub ap_pregsub
-#define process_request ap_process_request
-#define process_resource_config ap_process_resource_config
-#define proxy_add_header ap_proxy_add_header
-#define proxy_c2hex ap_proxy_c2hex
-#define proxy_cache_check ap_proxy_cache_check
-#define proxy_cache_error ap_proxy_cache_error
-#define proxy_cache_tidy ap_proxy_cache_tidy
-#define proxy_cache_update ap_proxy_cache_update
-#define proxy_canon_netloc ap_proxy_canon_netloc
-#define proxy_canonenc ap_proxy_canonenc
-#define proxy_connect_handler ap_proxy_connect_handler
-#define proxy_date_canon ap_proxy_date_canon
-#define proxy_del_header ap_proxy_del_header
-#define proxy_doconnect ap_proxy_doconnect
-#define proxy_ftp_canon ap_proxy_ftp_canon
-#define proxy_ftp_handler ap_proxy_ftp_handler
-#define proxy_garbage_coll ap_proxy_garbage_coll
-#define proxy_garbage_init ap_proxy_garbage_init
-#define proxy_get_header ap_proxy_get_header
-#define proxy_hash ap_proxy_hash
-#define proxy_hex2c ap_proxy_hex2c
-#define proxy_hex2sec ap_proxy_hex2sec
-#define proxy_host2addr ap_proxy_host2addr
-#define proxy_http_canon ap_proxy_http_canon
-#define proxy_http_handler ap_proxy_http_handler
-#define proxy_is_domainname ap_proxy_is_domainname
-#define proxy_is_hostname ap_proxy_is_hostname
-#define proxy_is_ipaddr ap_proxy_is_ipaddr
-#define proxy_is_word ap_proxy_is_word
-#define proxy_liststr ap_proxy_liststr
-#define proxy_read_headers ap_proxy_read_headers
-#define proxy_sec2hex ap_proxy_sec2hex
-#define proxy_send_fb ap_proxy_send_fb
-#define proxy_send_headers ap_proxy_send_headers
-#define proxyerror ap_proxyerror
-#define psignature ap_psignature
-#define psocket ap_psocket
-#define psprintf ap_psprintf
-#define pstrcat ap_pstrcat
-#define pstrdup ap_pstrdup
-#define pstrndup ap_pstrndup
-#define push_array ap_push_array
-#define pvsprintf ap_pvsprintf
-#define rationalize_mtime ap_rationalize_mtime
-#define read_config ap_read_config
-#define read_request ap_read_request
-#define register_cleanup ap_register_cleanup
-#define register_other_child ap_register_other_child
-#define release_mutex ap_release_mutex
-#define remove_module ap_remove_module
-#define requires ap_requires
-#define reset_timeout ap_reset_timeout
-#define response_code_string ap_response_code_string
-#define restart_time ap_restart_time
-#define rfc1413 ap_rfc1413
-#define rfc1413_timeout ap_rfc1413_timeout
-#define rflush ap_rflush
-#define rind ap_rind
-#define rprintf ap_rprintf
-#define rputc ap_rputc
-#define rputs ap_rputs
-#define run_cleanup ap_run_cleanup
-#define run_fixups ap_run_fixups
-#define run_post_read_request ap_run_post_read_request
-#define run_sub_req ap_run_sub_req
-#define rvputs ap_rvputs
-#define rwrite ap_rwrite
-#define satisfies ap_satisfies
-#define scan_script_header_err ap_scan_script_header_err
-#define scan_script_header_err_buff ap_scan_script_header_err_buff
-#define scoreboard_fname ap_scoreboard_fname
-#define scoreboard_image ap_scoreboard_image
-#define send_error_response ap_send_error_response
-#define send_fb ap_send_fb
-#define send_fb_length ap_send_fb_length
-#define send_fd ap_send_fd
-#define send_fd_length ap_send_fd_length
-#define send_header_field ap_send_header_field
-#define send_http_header ap_send_http_header
-#define send_http_options ap_send_http_options
-#define send_http_trace ap_send_http_trace
-#define send_mmap ap_send_mmap
-#define send_size ap_send_size
-#define server_argv0 ap_server_argv0
-#define server_confname ap_server_confname
-#define server_post_read_config ap_server_post_read_config
-#define server_pre_read_config ap_server_pre_read_config
-#define server_root ap_server_root
-#define server_root_relative ap_server_root_relative
-#define set_byterange ap_set_byterange
-#define set_callback_and_alarm ap_set_callback_and_alarm
-#define set_content_length ap_set_content_length
-#define set_etag ap_set_etag
-#define set_file_slot ap_set_file_slot
-#define set_flag_slot ap_set_flag_slot
-#define set_keepalive ap_set_keepalive
-#define set_last_modified ap_set_last_modified
-#define set_module_config ap_set_module_config
-#define set_name_virtual_host ap_set_name_virtual_host
-#define set_string_slot ap_set_string_slot
-#define set_string_slot_lower ap_set_string_slot_lower
-#define set_sub_req_protocol ap_set_sub_req_protocol
-#define setup_client_block ap_setup_client_block
-#define setup_prelinked_modules ap_setup_prelinked_modules
-#define should_client_block ap_should_client_block
-#define show_directives ap_show_directives
-#define show_modules ap_show_modules
-#define soft_timeout ap_soft_timeout
-#define some_auth_required ap_some_auth_required
-#define spawn_child_err ap_spawn_child
-#define spawn_child_err_buff ap_bspawn_child
-#define srm_command_loop ap_srm_command_loop
-#define standalone ap_standalone
-#define start_restart ap_start_restart
-#define start_shutdown ap_start_shutdown
-#define str_tolower ap_str_tolower
-#define strcasecmp_match ap_strcasecmp_match
-#define strcmp_match ap_strcmp_match
-#define sub_req_lookup_file ap_sub_req_lookup_file
-#define sub_req_lookup_uri ap_sub_req_lookup_uri
-#define suexec_enabled ap_suexec_enabled
-#define sync_scoreboard_image ap_sync_scoreboard_image
-#define table_add ap_table_add
-#define table_addn ap_table_addn
-#define table_do ap_table_do
-#define table_elts ap_table_elts
-#define table_get ap_table_get
-#define table_merge ap_table_merge
-#define table_mergen ap_table_mergen
-#define table_set ap_table_set
-#define table_setn ap_table_setn
-#define table_unset ap_table_unset
-#define threads_per_child ap_threads_per_child
-#define time_process_request ap_time_process_request
-#define tm2sec ap_tm2sec
-#define translate_name ap_translate_name
-#define uname2id ap_uname2id
-#define unblock_alarms ap_unblock_alarms
-#define unescape_url ap_unescape_url
-#define unparse_uri_components ap_unparse_uri_components
-#define unregister_other_child ap_unregister_other_child
-#define update_child_status ap_update_child_status
-#define update_mtime ap_update_mtime
-#define update_vhost_from_headers ap_update_vhost_from_headers
-#define update_vhost_given_ip ap_update_vhost_given_ip
-#define user_id ap_user_id
-#define user_name ap_user_name
-#define util_init ap_util_init
-#define util_uri_init ap_util_uri_init
-#define uudecode ap_uudecode
-#define vbprintf ap_vbprintf
-
-/*
- * Macros for routines whose arguments have changed over time.
- */
-#define spawn_child(p,f,v,k,in,out) ap_spawn_child(p,f,v,k,in,out,NULL)
-
-#ifdef __cplusplus
-}
+#if __GNUC__
+#warning "This header becomes obsolete, use ap_compat.h instead"
#endif
+
+#include "ap_compat.h"
-#endif /* APACHE_COMPAT_H */
1.225 +4 -1171 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- conf.h 1998/07/13 09:57:22 1.224
+++ conf.h 1998/07/13 11:32:35 1.225
@@ -1,1177 +1,10 @@
-/* ====================================================================
- * Copyright (c) 1995-1998 The Apache Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the Apache Group
- * for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Apache Group
- * for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
- * on public domain software written at the National Center for
- * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- */
-
-#ifndef APACHE_CONF_H
-#define APACHE_CONF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * conf.h: system-dependant #defines and includes...
- * See PORTING for a listing of what they mean
- */
-
-/*
- * Support for platform dependent autogenerated defines
- */
-#ifndef WIN32
-#include "conf_auto.h"
-#else
-/* not available under WIN32, so provide important entries manually */
-#undef HAVE_UNISTD_H
-#endif
-
-/* Have to include sys/stat.h before ../os/win32/os.h so we can override
-stat() properly */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef WIN32
-/* include process.h first so we can override spawn[lv]e* properly */
-#include <process.h>
-#include "../os/win32/os.h"
-#else
-#include "os.h"
-#endif
-
-#if !defined(QNX) && !defined(MPE) && !defined(WIN32)
-#include <sys/param.h>
-#endif
-
-/* Define one of these according to your system. */
-#if defined(MINT)
-typedef int rlim_t;
-#define JMP_BUF sigjmp_buf
-#define NO_LONG_DOUBLE
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define _BSD_SOURCE
-#define EAGAIN EWOULDBLOCK
-int initgroups (char *, int);
-char *crypt (const char *pw, const char *salt);
-int gethostname (char *name, int namelen);
-
-#elif defined(MPE)
-#include <sys/times.h>
-#define NO_SETSID
-#define NO_KILLPG
-#define NO_WRITEV
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define SHM_R 0400 /* Read permission */
-#define SHM_W 0200 /* Write permission */
-#define NEED_INITGROUPS
-#define NEED_STRCASECMP
-#define NEED_STRDUP
-#define NEED_STRNCASECMP
-extern void GETPRIVMODE();
-extern void GETUSERMODE();
-extern char *inet_ntoa();
-#define NO_SLACK
-#define NO_GETTIMEOFDAY
-#define S_IEXEC S_IXUSR
-#define S_IREAD S_IRUSR
-#define S_IWRITE S_IWUSR
-#define PF_INET AF_INET
-
-#elif defined(SUNOS4)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-char *crypt(const char *pw, const char *salt);
-char *mktemp(char *template);
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#include <sys/time.h>
-#define NEED_STRERROR
-typedef int rlim_t;
-#define memmove(a,b,c) bcopy(b,a,c)
-#define NO_LINGCLOSE
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define NEED_DIFFTIME
-#define HAVE_SYSLOG 1
-
-#elif defined(SOLARIS2)
-#undef HAVE_GMTOFF
-#define NO_KILLPG
-#undef NO_SETSID
-#define bzero(a,b) memset(a,0,b)
-#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \
- !defined(USE_PTHREAD_SERIALIZED_ACCEPT)
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#endif
-#define NEED_UNION_SEMUN
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-int gethostname(char *name, int namelen);
-#define HAVE_SYSLOG 1
-#define SYS_SIGLIST _sys_siglist
-
-#elif defined(IRIX)
-#undef HAVE_GMTOFF
-/* IRIX has killpg, but it's only in _BSD_COMPAT, so don't use it in case
- * there's some weird conflict with non-BSD signals */
-#define NO_KILLPG
-#undef NO_SETSID
-#if !defined(USE_FCNTL_SERIALIZED_ACCEPT) &&
!defined(USE_USLOCK_SERIALIZED_ACCEPT)
-#define USE_SYSVSEM_SERIALIZED_ACCEPT
-#endif
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define HAVE_MMAP 1
-#define USE_MMAP_FILES
-#define NO_LONG_DOUBLE
-#define NO_LINGCLOSE
-#define HAVE_SYSLOG 1
-
-#elif defined(HIUX)
-#undef HAVE_GMTOFF
-#define NO_KILLPG
-#undef NO_SETSID
-#ifndef _HIUX_SOURCE
-#define _HIUX_SOURCE
-#endif
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define SELECT_NEEDS_CAST
-#define HAVE_SYSLOG 1
-
-#elif defined(HPUX) || defined(HPUX10)
-#undef HAVE_GMTOFF
-#define NO_KILLPG
-#undef NO_SETSID
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#ifndef _HPUX_SOURCE
-#define _HPUX_SOURCE
-#endif
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define HAVE_SYSLOG 1
-#ifndef HPUX10
-#define SELECT_NEEDS_CAST
-typedef int rlim_t;
-#endif
-
-#elif defined(HPUX11)
-#ifndef _HPUX_SOURCE
-#define _HPUX_SOURCE
-#endif
-#define HAVE_SHMGET
-#define USE_SHMGET_SCOREBOARD
-#undef HAVE_GMTOFF
-#define HAVE_RESOURCE
-#define USE_FCNTL_SERIALIZED_ACCEPT
-/* feeling brave? want to try using POSIX mutexes? */
-/* #define HAVE_MMAP */
-/* #define USE_MMAP_SCOREBOARD */
-/* #define USE_MMAP_FILES */
-/* #define USE_PTHREAD_SERIALIZED_ACCEPT */
-#define NO_KILLPG
-#undef NO_SETSID
-#define HAVE_SYSLOG
-
-#elif defined(AIX)
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#ifndef __ps2__
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define HAVE_SYSLOG 1
-#ifndef DEFAULT_GROUP
-#define DEFAULT_GROUP "nobody"
-#endif
-#endif
-#ifndef DEFAULT_USER
-#define DEFAULT_USER "nobody"
-#endif
-#ifdef NEED_RLIM_T
-typedef int rlim_t;
-#endif
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#ifdef USEBCOPY
-#define memmove(a,b,c) bcopy(b,a,c)
-#endif
-#if AIX >= 42
-#define NET_SIZE_T size_t
-#endif
-
-#elif defined(ULTRIX)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-#define ULTRIX_BRAIN_DEATH
-#define NEED_STRDUP
-/* If you have Ultrix 4.3, and are using cc, const is broken */
-#ifndef __ultrix__ /* Hack to check for pre-Ultrix 4.4 cc */
-#define const /* Not implemented */
-#endif
-
-#elif defined(OSF1)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define NO_LONG_DOUBLE
-#define HAVE_SYSLOG 1
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-
-#elif defined(PARAGON)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define NO_LONG_DOUBLE
-#define HAVE_SYSLOG 1
-typedef int rlim_t;
-
-#elif defined(SEQUENT)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#define NO_SETSID
-#define NEED_STRDUP
-#define HAVE_SYSLOG 1
-
-#elif defined(NEXT)
-typedef unsigned short mode_t;
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#define NO_SETSID
-#define NEED_STRDUP
-#define NO_LINGCLOSE
-#undef _POSIX_SOURCE
-#ifndef FD_CLOEXEC
-#define FD_CLOEXEC 1
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR))
-#endif
-#ifndef S_ISREG
-#define S_ISREG(m) (((m)&(S_IFMT)) == (S_IFREG))
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 00100
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 00040
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 00010
-#endif
-#ifndef S_IROTH
-#define S_IROTH 00004
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 00001
-#endif
-#ifndef S_IRUSR
-#define S_IRUSR S_IREAD
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR S_IWRITE
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 000020
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 000002
-#ifndef rlim_t
-typedef int rlim_t;
-#endif
-typedef u_long n_long;
-#endif
-
-#define STDIN_FILENO 0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-
-/* PR#2293 fix */
-#define ap_wait_t union wait
-#define waitpid(a,b,c) wait4((a) == -1 ? 0 : (a),(union wait *)(b),c,NULL)
-#define WEXITSTATUS(status) (int)( WIFEXITED(status) ? (
(status).w_retcode ) : -1)
-#define WTERMSIG(status) (int)( (status).w_termsig )
-
-typedef int pid_t;
-#define USE_LONGJMP
-#define NO_USE_SIGACTION
-#define HAVE_SYSLOG 1
-
-#elif defined(LINUX)
-
-#if LINUX > 1
-#include <features.h>
-
-/* libc4 systems probably still work, it probably doesn't define
- * __GNU_LIBRARY__
- * libc5 systems define __GNU_LIBRARY__ == 1, but don't define __GLIBC__
- * glibc 2.x and later systems define __GNU_LIBRARY__ == 6, but list it as
- * "deprecated in favour of __GLIBC__"; the value 6 will never be changed.
- * glibc 1.x systems (i.e. redhat 4.x on sparc/alpha) should have
- * __GLIBC__ < 2
- * all glibc based systems need crypt.h
- */
-#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
-#include <crypt.h>
-#endif
-
-/* glibc 2.0.0 through 2.0.4 need size_t * here, where 2.0.5 needs socklen_t
*
- * there's no way to discern between these two libraries. But using int
should
- * be portable because otherwise these libs would be hopelessly broken with
- * reams of existing networking code. We'll use socklen_t * for 2.1.x and
- * later.
- *
- * int works for all the earlier libs, and is picked up by default later.
- */
-#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 &&
__GLIBC_MINOR__ > 0))
-#define NET_SIZE_T socklen_t
-#endif
-
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define HAVE_MMAP 1
-#define USE_MMAP_FILES
-
-/* glibc 2.1 and later finally define rlim_t */
-#if !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 &&
__GLIBC_MINOR__ < 1)
-typedef int rlim_t;
-#endif
-
-/* flock is faster ... but hasn't been tested on 1.x systems */
-#define USE_FLOCK_SERIALIZED_ACCEPT
-
-#define SYS_SIGLIST _sys_siglist
-
-#else
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#endif
-
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#undef NEED_STRDUP
-#include <sys/time.h>
-#define HAVE_SYSLOG 1
-
-#elif defined(SCO)
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#define NEED_INITGROUPS
-#define NO_WRITEV
-#include <sys/time.h>
-#define HAVE_SYSLOG 1
-
-#elif defined(SCO5)
-
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define SecureWare
-#define HAVE_SYSLOG 1
-
-/* Although SCO 5 defines these in <strings.h> (note the "s") they don't have
- consts. Sigh. */
-extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *, const char *, unsigned);
-
-#elif defined(AUX3)
-/* These are to let -Wall compile more cleanly */
-extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *, const char *, unsigned);
-extern int set42sig(), getopt(), getpeername(), bzero();
-extern int listen(), bind(), socket(), getsockname();
-extern int accept(), gethostname(), connect(), lstat();
-extern int select(), killpg(), shutdown();
-extern int initgroups(), setsockopt();
-extern char *shmat();
-extern int shmctl();
-extern int shmget();
-extern char *sbrk();
-extern char *crypt();
-#include <sys/time.h>
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#define NEED_STRDUP
-/* fcntl() locking is expensive with NFS */
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
/*
- * NOTE: If when you run Apache under A/UX and you get a warning
- * that httpd couldn't move break, then the below value for
- * MOVEBREAK (64megs) is too large for your setup. Try reducing
- * to 0x2000000 which is still PLENTY of space. I doubt if
- * even on heavy systems sbrk() would be called at all...
+ * conf.h -- backward compatibility header for ap_config.h
*/
-#define MOVEBREAK 0x4000000
-#define NO_LINGCLOSE
-#define NO_SLACK
-#define HAVE_SYSLOG 1
-#undef HAVE_SYS_RESOURCE_H /* exists but does not provide *rlimit funcs */
-
-#elif defined(SVR4)
-#define NO_KILLPG
-#undef NO_SETSID
-#undef NEED_STRDUP
-#ifndef MPRAS
-#define NEED_STRCASECMP
-#ifndef ENCORE
-#define NEED_STRNCASECMP
-#endif /* ENCORE */
-#endif /* MPRAS */
-#define bzero(a,b) memset(a,0,b)
-/* A lot of SVR4 systems need this */
-#ifndef USE_SYSVSEM_SERIALIZED_ACCEPT
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#endif
-#define HAVE_SYSLOG 1
-#define NET_SIZE_T size_t
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#ifdef _OSD_POSIX /* BS2000-POSIX mainframe needs initgroups */
-#define NEED_INITGROUPS
-#define NEED_HASHBANG_EMUL /* execve() doesn't start shell scripts by
default */
-#undef HAVE_SHMGET
-#undef USE_SHMGET_SCOREBOARD
-#undef bzero
-#endif /*_OSD_POSIX*/
-
-#elif defined(UW)
-#define NO_LINGCLOSE
-#define NO_KILLPG
-#undef NO_SETSID
-#undef NEED_STRDUP
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define bzero(a,b) memset(a,0,b)
-#define HAVE_RESOURCE 1
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define HAVE_SHMGET 1
-#undef USE_SHMGET_SCOREBOARD /* force use of mmap() scoreboard */
-#include <sys/time.h>
-#if UW >= 200
-#define _POSIX_SOURCE
-#endif
-#define NET_SIZE_T size_t
-#define HAVE_SYSLOG 1
-#define USE_FCNTL_SERIALIZED_ACCEPT
-
-#elif defined(DGUX)
-#define NO_KILLPG
-#undef NO_SETSID
-#undef NEED_STRDUP
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define bzero(a,b) memset(a,0,b)
-/* A lot of SVR4 systems need this */
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#define ap_inet_addr inet_network
-#define HAVE_SYSLOG 1
-
-#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(NETBSD)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-#define HAVE_SYSLOG 1
-#ifndef DEFAULT_USER
-#define DEFAULT_USER "nobody"
-#endif
-#ifndef DEFAULT_GROUP
-#define DEFAULT_GROUP "nogroup"
-#define HAVE_SHMGET 1
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#endif
-
-#elif defined(UTS21)
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#define NO_SETSID
-#define NEED_WAITPID
-#define STDIN_FILENO 0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-#define HAVE_SYSLOG 1
-#define USE_LONGJMP
-#define JMP_BUF jmp_buf
-#define NO_USE_SIGACTION
-#define NEED_STRERROR
-#define NEED_STRSTR
-#define NEED_HASHBANG_EMUL
-#define NDELAY_PIPE_RETURNS_ZERO
-#define NO_DATA NO_ADDRESS
-#define ap_wait_t union wait
-#define WEXITSTATUS(status) (int)((status).w_retcode)
-#define WTERMSIG(status) (int)((status).w_termsig)
-#define strftime(buf,bufsize,fmt,tm) ascftime(buf,fmt,tm)
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined(APOLLO)
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#define HAVE_SYSLOG 1
-
-#elif defined(__FreeBSD__) || defined(__bsdi__)
-#if defined(__FreeBSD__)
-#include <osreldate.h>
-#endif
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#undef NO_SETSID
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#ifndef DEFAULT_USER
-#define DEFAULT_USER "nobody"
-#endif
-#ifndef DEFAULT_GROUP
-#define DEFAULT_GROUP "nogroup"
-#endif
-#if defined(__bsdi__) || \
-(defined(__FreeBSD_version) && (__FreeBSD_version < 220000))
-typedef quad_t rlim_t;
-#endif
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define HAVE_SYSLOG 1
-#define SYS_SIGLIST sys_siglist
-
-#elif defined(QNX)
-#ifndef crypt
-char *crypt(const char *pw, const char *salt);
-#endif
-#ifndef initgroups
-int initgroups(char *, int);
-#endif
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-#undef NO_KILLPG
-#undef NO_SETSID
-#define NEED_INITGROUPS
-#define NEED_SELECT_H
-#define NEED_PROCESS_H
-#include <unix.h>
-#define HAVE_MMAP 1
-#define USE_POSIX_SCOREBOARD
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-#define HAVE_SYSLOG 1
-
-#elif defined(LYNXOS)
-#undef HAVE_GMTOFF
-#define HAVE_RESOURCE 1
-#undef USE_MMAP_SCOREBOARD
-#undef USE_SHMGET_SCOREBOARD
-#undef USE_FCNTL_SERIALIZED_ACCEPT
-#undef USE_FLOCK_SERIALIZED_ACCEPT
-#define USE_LONGJMP
-#undef NO_KILLPG
-#undef NO_SETSID
-#undef NO_USE_SIGACTION
-#undef NO_LINGCLOSE
-extern char *crypt(char *pw, char *salt);
-typedef int rlim_t;
-#define HAVE_SYSLOG 1
-
-#elif defined(UXPDS)
-#undef NEED_STRCASECMP
-#undef NEED_STRNCASECMP
-#undef NEED_STRDUP
-#undef HAVE_GMTOFF
-#define NO_KILLPG
-#undef NO_SETSID
-#define HAVE_RESOURCE 1
-#define bzero(a,b) memset(a,0,b)
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define HAVE_SYSLOG 1
-
-#elif defined(__EMX__)
-/* Defines required for EMX OS/2 port. */
-#define NO_KILLPG
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define NO_SETSID
-#define NO_TIMES
-#define CASE_BLIND_FILESYSTEM
-/* Add some drive name support */
-#define chdir _chdir2
-#include <sys/time.h>
-#define MAXSOCKETS 4096
-#define USE_OS2_SCOREBOARD
-#define NO_RELIABLE_PIPED_LOGS
-
-#elif defined(__MACHTEN__)
-typedef int rlim_t;
-#undef NO_KILLPG
-#define NO_SETSID
-#define HAVE_GMTOFF 1
-#ifndef __MACHTEN_PPC__
-#ifndef __MACHTEN_68K__
-#define __MACHTEN_68K__
-#endif
-#define USE_FLOCK_SERIALIZED_ACCEPT
-#define NO_USE_SIGACTION
-#define JMP_BUF sigjmp_buf
-#define USE_LONGJMP
-#undef NEED_STRDUP
-#else
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#endif
-
-/* Convex OS v11 */
-#elif defined(CONVEXOS11)
-#undef HAVE_GMTOFF
-#undef NO_KILLPG
-#undef NO_SETSID
-#undef NEED_STRDUP
-#define HAVE_MMAP 1
-#define USE_MMAP_SCOREBOARD
-#define USE_MMAP_FILES
-#define HAVE_SYSLOG 1
-
-#define NO_TIMEZONE
-#include <stdio.h>
-#include <sys/types.h>
-typedef int rlim_t;
-
-#elif defined(ISC)
-#include <net/errno.h>
-#define NO_KILLPG
-#undef NO_SETSID
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define USE_FCNTL_SERIALIZED_ACCEPT
-#define HAVE_SYSLOG 1
-
-#elif defined(NEWSOS)
-#define HAVE_SHMGET 1
-#define USE_SHMGET_SCOREBOARD
-#define USE_LONGJMP
-#define NO_SETSID
-#define NO_USE_SIGACTION
-#define NEED_WAITPID
-#define NO_OTHER_CHILD
-#define HAVE_SYSLOG 1
-#include <sys/time.h>
-#include <stdlib.h>
-#include <sys/types.h>
-typedef int pid_t;
-typedef int rlim_t;
-typedef int mode_t;
-
-#elif defined(RISCIX)
-#include <sys/time.h>
-typedef int rlim_t;
-#define NO_USE_SIGACTION
-#define USE_LONGJMP
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define NEED_STRDUP
-
-#elif defined(BEOS)
-#include <stddef.h>
-
-#define NO_WRITEV
-#define NO_KILLPG
-#define NEED_INITGROUPS
-
-#elif defined(WIN32)
-
-/* All windows stuff is now in os/win32/os.h */
-
-#else
-/* Unknown system - Edit these to match */
-#ifdef BSD
-#define HAVE_GMTOFF 1
-#else
-#undef HAVE_GMTOFF
-#endif
-/* NO_KILLPG is set on systems that don't have killpg */
-#undef NO_KILLPG
-/* NO_SETSID is set on systems that don't have setsid */
-#undef NO_SETSID
-/* NEED_STRDUP is set on stupid systems that don't have strdup. */
-#undef NEED_STRDUP
-#endif
-
-/* stuff marked API_EXPORT is part of the API, and intended for use
- * by modules
- */
-#ifndef API_EXPORT
-#define API_EXPORT(type) type
+#if __GNUC__
+#warning "This header becomes obsolete, use ap_config.h instead"
#endif
-/* Stuff marked API_EXPORT_NONSTD is part of the API, and intended for
- * use by modules. The difference between API_EXPORT and
- * API_EXPORT_NONSTD is that the latter is required for any functions
- * which use varargs or are used via indirect function call. This
- * is to accomodate the two calling conventions in windows dlls.
- */
-#ifndef API_EXPORT_NONSTD
-#define API_EXPORT_NONSTD(type) type
-#endif
-
-#ifndef MODULE_VAR_EXPORT
-#define MODULE_VAR_EXPORT
-#endif
-#ifndef API_VAR_EXPORT
-#define API_VAR_EXPORT
-#endif
-
-/* modules should not used functions marked CORE_EXPORT
- * or CORE_EXPORT_NONSTD */
-#ifndef CORE_EXPORT
-#define CORE_EXPORT API_EXPORT
-#endif
-#ifndef CORE_EXPORT_NONSTD
-#define CORE_EXPORT_NONSTD API_EXPORT_NONSTD
-#endif
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions). Only do this in gcc 2.7 or later ... it may work
- * on earlier stuff, but why chance it.
- *
- * We've since discovered that the gcc shipped with NeXT systems
- * as "cc" is completely broken. It claims to be __GNUC__ and so
- * on, but it doesn't implement half of the things that __GNUC__
- * means. In particular it's missing inline and the __attribute__
- * stuff. So we hack around it. PR#1613. -djg
- */
-#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7 || defined(NEXT)
-#define ap_inline
-#define __attribute__(__x)
-#define ENUM_BITFIELD(e,n,w) signed int n : w
-#else
-#define ap_inline __inline__
-#define USE_GNU_INLINE
-#define ENUM_BITFIELD(e,n,w) e n : w
-#endif
-
-/*
- * The particular directory style your system supports. If you have dirent.h
- * in /usr/include (POSIX) or /usr/include/sys (SYSV), #include
- * that file and define DIR_TYPE to be dirent. Otherwise, if you have
- * /usr/include/sys/dir.h, define DIR_TYPE to be direct and include that
- * file. If you have neither, I'm confused.
- */
-
-#include <sys/types.h>
-#include <stdarg.h>
-
-#if !defined(NEXT) && !defined(WIN32)
-#include <dirent.h>
-#define DIR_TYPE dirent
-#elif !defined(WIN32)
-#include <sys/dir.h>
-#define DIR_TYPE direct
-#else
-#define DIR_TYPE dirent
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "apctype.h"
-#if !defined(MPE) && !defined(WIN32)
-#include <sys/file.h>
-#endif
-#ifndef WIN32
-#include <sys/socket.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H */
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#if !defined(MPE) && !defined(BEOS)
-#include <arpa/inet.h> /* for inet_ntoa */
-#endif
-#include <sys/wait.h>
-#include <pwd.h>
-#include <grp.h>
-#include <fcntl.h>
-#include <limits.h>
-#define closesocket(s) close(s)
-#ifndef O_BINARY
-#define O_BINARY (0)
-#endif
-
-#else /* WIN32 */
-#include <winsock.h>
-#include <malloc.h>
-#include <io.h>
-#include <fcntl.h>
-#endif /* ndef WIN32 */
-
-#include <time.h> /* for ctime */
-#include <signal.h>
-#include <errno.h>
-#if !defined(QNX) && !defined(CONVEXOS11) && !defined(NEXT)
-#include <memory.h>
-#endif
-
-#ifdef NEED_PROCESS_H
-#include <process.h>
-#endif
-
-#ifdef WIN32
-#include "../include/hsregex.h"
-#elif defined(USE_HSREGEX)
-#include "hsregex.h"
-#else
-#include <regex.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#ifdef SUNOS4
-int getrlimit(int, struct rlimit *);
-int setrlimit(int, struct rlimit *);
-#endif
-#endif
-#ifdef USE_MMAP_SCOREBOARD
-#if !defined(__EMX__) && !defined(WIN32)
-/* This file is not needed for OS/2 */
-#include <sys/mman.h>
-#endif
-#endif
-#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
-#define MAP_ANON MAP_ANONYMOUS
-#endif
-
-#if defined(USE_MMAP_FILES) && (defined(NO_MMAP) || !defined(HAVE_MMAP))
-#undef USE_MMAP_FILES
-#endif
-
-#if defined(USE_MMAP_SCOREBOARD) && (defined(NO_MMAP) || !defined(HAVE_MMAP))
-#undef USE_MMAP_SCOREBOARD
-#endif
-
-#if defined(USE_SHMGET_SCOREBOARD) && (defined(NO_SHMGET) ||
!defined(HAVE_SHMGET))
-#undef USE_SHMGET_SCOREBOARD
-#endif
-
-#ifndef LOGNAME_MAX
-#define LOGNAME_MAX 25
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef ultrix
-#define ULTRIX_BRAIN_DEATH
-#endif
-
-#ifndef S_ISLNK
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned long) -1)
-#endif
-
-/*
- * Replace signal function with sigaction equivalent
- */
-#ifndef NO_USE_SIGACTION
-typedef void Sigfunc(int);
-
-#if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((Sigfunc *)-1)
-#endif
-
-/*
- * For some strange reason, QNX defines signal to signal. Eliminate it.
- */
-#ifdef signal
-#undef signal
-#endif
-#define signal(s,f) ap_signal(s,f)
-Sigfunc *signal(int signo, Sigfunc * func);
-#endif
-
-#include <setjmp.h>
-
-#if defined(USE_LONGJMP)
-#define ap_longjmp(x, y) longjmp((x), (y))
-#define ap_setjmp(x) setjmp(x)
-#ifndef JMP_BUF
-#define JMP_BUF jmp_buf
-#endif
-#else
-#define ap_longjmp(x, y) siglongjmp((x), (y))
-#define ap_setjmp(x) sigsetjmp((x), 1)
-#ifndef JMP_BUF
-#define JMP_BUF sigjmp_buf
-#endif
-#endif
-
-#ifdef SELECT_NEEDS_CAST
-#define ap_select(_a, _b, _c, _d, _e) \
- select((_a), (int *)(_b), (int *)(_c), (int *)(_d), (_e))
-#else
-#define ap_select select
-#endif
-
-#ifdef ULTRIX_BRAIN_DEATH
-#define ap_fdopen(d,m) fdopen((d), (char *)(m))
-#else
-#define ap_fdopen(d,m) fdopen((d), (m))
-#endif
-
-#ifndef ap_inet_addr
-#define ap_inet_addr inet_addr
-#endif
-
-#ifdef NO_OTHER_CHILD
-#define NO_RELIABLE_PIPED_LOGS
-#endif
-
-/* When the underlying OS doesn't support exec() of scripts which start
- * with a HASHBANG (#!) followed by interpreter name and args, define this.
- */
-#ifdef NEED_HASHBANG_EMUL
-extern int ap_execle(const char *filename, const char *arg,...);
-extern int ap_execve(const char *filename, const char *argv[],
- const char *envp[]);
-/* ap_execle() is a wrapper function around ap_execve(). */
-#define execle ap_execle
-#define execve(path,argv,envp) ap_execve(path,argv,envp)
-#endif
-
-/* Finding offsets of elements within structures.
- * Taken from the X code... they've sweated portability of this stuff
- * so we don't have to. Sigh...
- */
-
-#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-#ifdef __STDC__
-#define XtOffset(p_type,field) _Offsetof(p_type,field)
-#else
-#ifdef CRAY2
-#define XtOffset(p_type,field) \
- (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
-
-#else /* !CRAY2 */
-
-#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
-
-#endif /* !CRAY2 */
-#endif /* __STDC__ */
-#else /* ! (CRAY || __arm) */
-
-#define XtOffset(p_type,field) \
- ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-
-#endif /* !CRAY */
-
-#ifdef offsetof
-#define XtOffsetOf(s_type,field) offsetof(s_type,field)
-#else
-#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
-#endif
-
-/*
- * NET_SIZE_T exists because of shortsightedness on the POSIX committee. BSD
- * systems used "int *" as the parameter to accept(), getsockname(),
- * getpeername() et al. Consequently many unixes took an int * for that
- * parameter. The POSIX committee decided that "int" was just too generic
and
- * had to be replaced with size_t almost everywhere. There's no problem with
- * that when you're passing by value. But when you're passing by reference
- * this creates a gross source incompatibility with existing programs. On
- * 32-bit architectures it creates only a warning. On 64-bit architectures
it
- * creates broken code -- because "int *" is a pointer to a 64-bit quantity
and
- * "size_t *" is frequently a pointer to a 32-bit quantity.
- *
- * Some Unixes adopted "size_t *" for the sake of POSIX compliance. Others
- * ignored it because it was such a broken interface. Chaos ensued. POSIX
- * finally woke up and decided that it was wrong and created a new type
- * socklen_t. The only useful value for socklen_t is int, and that's how
- * everyone who has a clue implements it. It is almost always the case that
- * NET_SIZE_T should be defined to be an int, unless the system being
compiled
- * for was created in the window of POSIX madness.
- */
-#ifndef NET_SIZE_T
-#define NET_SIZE_T int
-#endif
-
-/* Linux defines __WCOREDUMP, but doesn't define WCOREDUMP unless __USE_BSD
- * is in use... we'd prefer to just use WCOREDUMP everywhere.
- */
-#if defined(__WCOREDUMP) && !defined(WCOREDUMP)
-#define WCOREDUMP __WCOREDUMP
-#endif
-
-#ifdef SUNOS_LIB_PROTOTYPES
-/* Prototypes needed to get a clean compile with gcc -Wall.
- * Believe it or not, these do have to be declared, at least on SunOS,
- * because they aren't mentioned in the relevant system headers.
- * Sun Quality Software. Gotta love it. This section is not
- * currently (13Nov97) used.
- */
-
-int getopt(int, char **, char *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, int);
-int toupper(int);
-int tolower(int);
-
-int printf(char *,...);
-int fprintf(FILE *, char *,...);
-int fputs(char *, FILE *);
-int fread(char *, int, int, FILE *);
-int fwrite(char *, int, int, FILE *);
-int fgetc(FILE *);
-char *fgets(char *s, int, FILE*);
-int fflush(FILE *);
-int fclose(FILE *);
-int ungetc(int, FILE *);
-int _filbuf(FILE *); /* !!! */
-int _flsbuf(unsigned char, FILE *); /* !!! */
-int sscanf(char *, char *,...);
-void setbuf(FILE *, char *);
-void perror(char *);
-
-time_t time(time_t *);
-int strftime(char *, int, const char *, struct tm *);
-
-int initgroups(char *, int);
-int wait3(int *, int, void *); /* Close enough for us... */
-int lstat(const char *, struct stat *);
-int stat(const char *, struct stat *);
-int flock(int, int);
-#ifndef NO_KILLPG
-int killpg(int, int);
-#endif
-int socket(int, int, int);
-int setsockopt(int, int, int, const char *, int);
-int listen(int, int);
-int bind(int, struct sockaddr *, int);
-int connect(int, struct sockaddr *, int);
-int accept(int, struct sockaddr *, int *);
-int shutdown(int, int);
-
-int getsockname(int s, struct sockaddr *name, int *namelen);
-int getpeername(int s, struct sockaddr *name, int *namelen);
-int gethostname(char *name, int namelen);
-void syslog(int, char *,...);
-char *mktemp(char *);
-
-long vfprintf(FILE *, const char *, va_list);
-
-#endif /* SUNOS_LIB_PROTOTYPES */
-
-/* The assumption is that when the functions are missing,
- * then there's no matching prototype available either.
- * Declare what is needed exactly as the replacement routines implement it.
- */
-#ifdef NEED_STRDUP
-extern char *strdup (const char *str);
-#endif
-#ifdef NEED_STRCASECMP
-extern int strcasecmp (const char *a, const char *b);
-#endif
-#ifdef NEED_STRNCASECMP
-extern int strncasecmp (const char *a, const char *b, int n);
-#endif
-#ifdef NEED_INITGROUPS
-extern int initgroups(const char *name, gid_t basegid);
-#endif
-#ifdef NEED_WAITPID
-extern int waitpid(pid_t pid, int *statusp, int options);
-#endif
-#ifdef NEED_STRERROR
-extern char *strerror (int err);
-#endif
-#ifdef NEED_DIFFTIME
-extern double difftime(time_t time1, time_t time0);
-#endif
-
-#ifndef ap_wait_t
-#define ap_wait_t int
-#endif
-
-#ifdef __cplusplus
-}
-#endif
+#include "ap_compat.h"
-#endif /* !APACHE_CONF_H */
1.7 +1 -1 apache-1.3/src/include/fnmatch.h
Index: fnmatch.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/fnmatch.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fnmatch.h 1998/06/28 14:43:18 1.6
+++ fnmatch.h 1998/07/13 11:32:35 1.7
@@ -35,7 +35,7 @@
/* This file has been modified by the Apache Group. */
-#include "conf.h"
+#include "ap_config.h"
#ifndef _FNMATCH_H_
#define _FNMATCH_H_
1.90 +1 -1 apache-1.3/src/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- http_config.h 1998/07/09 00:09:21 1.89
+++ http_config.h 1998/07/13 11:32:35 1.90
@@ -275,7 +275,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19980708
+#define MODULE_MAGIC_NUMBER 19980713
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
/* Generic accessors for other modules to get at their own module-specific
1.226 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- httpd.h 1998/06/19 21:02:37 1.225
+++ httpd.h 1998/07/13 11:32:35 1.226
@@ -68,7 +68,7 @@
/* Headers in which EVERYONE has an interest... */
-#include "conf.h"
+#include "ap_config.h"
#include "alloc.h"
#include "buff.h"
#include "ap.h"
1.31 +91 -83 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.tmpl 1998/07/12 09:19:15 1.30
+++ Makefile.tmpl 1998/07/13 11:32:38 1.31
@@ -58,100 +58,108 @@
$(OBJS): Makefile
# DO NOT REMOVE
-alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/multithread.h $(INCDIR)/http_log.h
-buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h
-fnmatch.o: fnmatch.c $(INCDIR)/conf.h $(INCDIR)/conf_auto.h \
- $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/fnmatch.h
-gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h
+alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/multithread.h \
+ $(INCDIR)/http_log.h
+buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h
+fnmatch.o: fnmatch.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
+gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
gen_uri_delims.o: gen_uri_delims.c
-http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \
- $(INCDIR)/explain.h
-http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/fnmatch.h
-http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h
-http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
+http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \
+ $(INCDIR)/http_vhost.h $(INCDIR)/explain.h
+http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_vhost.h \
- $(INCDIR)/util_script.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/multithread.h $(INCDIR)/explain.h
-http_protocol.o: http_protocol.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
+ $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
+http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h
+http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \
+ $(INCDIR)/scoreboard.h $(INCDIR)/multithread.h $(INCDIR)/explain.h
+http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \
$(INCDIR)/http_log.h $(INCDIR)/util_date.h \
$(INCDIR)/http_conf_globals.h
-http_request.o: http_request.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
-http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+http_request.o: http_request.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h \
+ $(INCDIR)/fnmatch.h
+http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h \
$(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h
-md5c.o: md5c.c $(INCDIR)/conf.h $(INCDIR)/conf_auto.h \
- $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/ap_md5.h
-rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
- $(INCDIR)/http_main.h
-util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_conf_globals.h \
+md5c.o: md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/ap_md5.h
+rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
+ $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h
+util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_conf_globals.h \
$(INCDIR)/http_log.h test_char.h
-util_date.o: util_date.c $(INCDIR)/conf.h $(INCDIR)/conf_auto.h \
- $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/util_date.h
-util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
-util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+util_date.o: util_date.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
+util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h \
+ $(INCDIR)/ap_md5.h
+util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/util_script.h $(INCDIR)/util_date.h
-util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
+util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
$(INCDIR)/http_conf_globals.h uri_delims.h
1.15 +1 -1 apache-1.3/src/main/fnmatch.c
Index: fnmatch.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/fnmatch.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fnmatch.c 1998/07/08 17:47:05 1.14
+++ fnmatch.c 1998/07/13 11:32:39 1.15
@@ -43,7 +43,7 @@
* Compares a filename or pathname to a pattern.
*/
-#include "conf.h"
+#include "ap_config.h"
#include "fnmatch.h"
#include <string.h>
1.212 +1 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- http_core.c 1998/07/13 02:44:24 1.211
+++ http_core.c 1998/07/13 11:32:39 1.212
@@ -1966,7 +1966,7 @@
{
char *str;
struct rlimit *limit;
- /* If your platform doesn't define rlim_t then typedef it in conf.h */
+ /* If your platform doesn't define rlim_t then typedef it in ap_config.h
*/
rlim_t cur = 0;
rlim_t max = 0;
1.372 +3 -3 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- http_main.c 1998/07/11 10:24:09 1.371
+++ http_main.c 1998/07/13 11:32:39 1.372
@@ -1176,7 +1176,7 @@
*
* Many operating systems tend to block, puke, or otherwise mishandle
* calls to shutdown only half of the connection. You should define
- * NO_LINGCLOSE in conf.h if such is the case for your system.
+ * NO_LINGCLOSE in ap_config.h if such is the case for your system.
*/
#ifndef MAX_SECS_TO_LINGER
#define MAX_SECS_TO_LINGER 30
@@ -1553,7 +1553,7 @@
*
* 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
- * of conf.h
+ * of ap_config.h
*
* June 5, 1997,
* Igor N. Kovalenko -- [EMAIL PROTECTED]
@@ -5576,7 +5576,7 @@
#include <stdlib.h>
#include <string.h>
-#include "conf.h"
+#include "ap_config.h"
#include "httpd.h"
#define VARNAME "LD_LIBRARY_PATH"
1.16 +1 -1 apache-1.3/src/main/md5c.c
Index: md5c.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/md5c.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- md5c.c 1998/05/29 18:20:54 1.15
+++ md5c.c 1998/07/13 11:32:40 1.16
@@ -90,7 +90,7 @@
#include <string.h>
-#include "conf.h"
+#include "ap_config.h"
#include "ap_md5.h"
#ifdef CHARSET_EBCDIC
#include "ebcdic.h"
1.26 +1 -1 apache-1.3/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rfc1413.c 1998/07/08 16:54:34 1.25
+++ rfc1413.c 1998/07/13 11:32:40 1.26
@@ -68,7 +68,7 @@
*/
/* Some small additions for Apache --- ditch the "sccsid" var if
- * compiling with gcc (it *has* changed), include conf.h for the
+ * compiling with gcc (it *has* changed), include ap_config.h for the
* prototypes it defines on at least one system (SunlOSs) which has
* them missing from the standard header files, and one minor change
* below (extra parens around assign "if (foo = bar) ..." to shut up
1.124 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- util.c 1998/07/08 17:47:06 1.123
+++ util.c 1998/07/13 11:32:41 1.124
@@ -72,7 +72,7 @@
#include "http_conf_globals.h" /* for user_id & group_id */
#include "http_log.h"
#if defined(SUNOS4)
-/* stdio.h has been read in conf.h already. Add missing prototypes here: */
+/* stdio.h has been read in ap_config.h already. Add missing prototypes
here: */
extern int fgetc(FILE *);
extern char *fgets(char *s, int, FILE*);
extern int fclose(FILE *);
1.13 +1 -1 apache-1.3/src/main/util_date.c
Index: util_date.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util_date.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- util_date.c 1998/07/08 17:47:06 1.12
+++ util_date.c 1998/07/13 11:32:41 1.13
@@ -66,7 +66,7 @@
*
*/
-#include "conf.h"
+#include "ap_config.h"
#include "util_date.h"
#include <ctype.h>
#include <string.h>
1.9 +7 -6 apache-1.3/src/modules/example/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/07/12 09:19:16 1.8
+++ Makefile.tmpl 1998/07/13 11:32:44 1.9
@@ -5,9 +5,10 @@
# DO NOT REMOVE
mod_example.o: mod_example.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/util_script.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/util_script.h
1.12 +6 -6 apache-1.3/src/modules/experimental/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.tmpl 1998/07/12 09:19:18 1.11
+++ Makefile.tmpl 1998/07/13 11:32:44 1.12
@@ -5,9 +5,9 @@
# DO NOT REMOVE
mod_mmap_static.o: mod_mmap_static.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_core.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h
1.22 +40 -39 apache-1.3/src/modules/proxy/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.tmpl 1998/07/12 09:19:21 1.21
+++ Makefile.tmpl 1998/07/13 11:32:45 1.22
@@ -53,47 +53,48 @@
# DO NOT REMOVE
mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_vhost.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h
proxy_cache.o: proxy_cache.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/util_date.h \
- $(INCDIR)/multithread.h $(INCDIR)/ap_md5.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/util_date.h $(INCDIR)/multithread.h \
+ $(INCDIR)/ap_md5.h
proxy_connect.o: proxy_connect.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h
proxy_ftp.o: proxy_ftp.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h
proxy_http.o: proxy_http.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/util_date.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_core.h $(INCDIR)/util_date.h
proxy_util.o: proxy_util.c mod_proxy.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/explain.h $(INCDIR)/http_main.h \
- $(INCDIR)/ap_md5.h $(INCDIR)/multithread.h \
- $(INCDIR)/http_log.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_main.h $(INCDIR)/ap_md5.h \
+ $(INCDIR)/multithread.h $(INCDIR)/http_log.h
1.20 +150 -128 apache-1.3/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.tmpl 1998/07/12 09:19:22 1.19
+++ Makefile.tmpl 1998/07/13 11:32:46 1.20
@@ -4,206 +4,228 @@
$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
-mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_access.o: mod_access.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
$(INCDIR)/http_request.h
mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
- $(INCDIR)/util_script.h
-mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h
+mod_alias.o: mod_alias.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h
-mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/util_script.h $(INCDIR)/http_main.h \
$(INCDIR)/http_request.h
-mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_request.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h
mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_protocol.h
mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_protocol.h
mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
- $(INCDIR)/util_script.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_main.h $(INCDIR)/util_script.h
mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/util_script.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_request.h
-mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/util_script.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_request.h
+mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h \
$(INCDIR)/http_conf_globals.h
-mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_digest.o: mod_digest.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
$(INCDIR)/ap_md5.h
-mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h
-mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h
mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_log.h
mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h
-mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
+mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h
mod_include.o: mod_include.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
- $(INCDIR)/util_script.h
-mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_main.h $(INCDIR)/util_script.h
+mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
$(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_log.h
-mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_log.h
+mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h
mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_log.h
-mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_log.h
+mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_log.h
mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_protocol.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
- $(INCDIR)/util_script.h
-mod_rewrite.o: mod_rewrite.c mod_rewrite.h $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h
+mod_rewrite.o: mod_rewrite.c mod_rewrite.h $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_vhost.h
mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h
-mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h
+mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_log.h
mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h
-mod_status.o: mod_status.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \
+mod_status.o: mod_status.c $(INCDIR)/httpd.h \
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h \
$(INCDIR)/scoreboard.h $(INCDIR)/http_log.h
mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
- $(INCDIR)/multithread.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_log.h $(INCDIR)/multithread.h
mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \
- $(INCDIR)/conf.h $(INCDIR)/conf_auto.h $(OSDIR)/os.h \
- $(INCDIR)/apctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_core.h
+ $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h
1.55 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_rewrite.h 1998/07/11 10:56:08 1.54
+++ mod_rewrite.h 1998/07/13 11:32:46 1.55
@@ -130,7 +130,7 @@
/* The locking support:
* Try to determine whether we should use fcntl() or flock().
- * Would be better conf.h could provide this... :-(
+ * Would be better ap_config.h could provide this... :-(
*/
#if defined(USE_FCNTL_SERIALIZED_ACCEPT)
#define USE_FCNTL 1
1.8 +1 -1 apache-1.3/src/os/bs2000/ebcdic.c
Index: ebcdic.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/ebcdic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebcdic.c 1998/05/13 15:31:01 1.7
+++ ebcdic.c 1998/07/13 11:32:47 1.8
@@ -57,7 +57,7 @@
#ifdef CHARSET_EBCDIC
-#include "conf.h"
+#include "ap_config.h"
#include "ebcdic.h"
/*
Initial Port for Apache-1.3 by <[EMAIL PROTECTED]>
1.6 +1 -1 apache-1.3/src/os/bs2000/os-inline.c
Index: os-inline.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os-inline.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- os-inline.c 1998/04/13 18:05:17 1.5
+++ os-inline.c 1998/07/13 11:32:47 1.6
@@ -21,7 +21,7 @@
#define INLINE
/* Anything required only when compiling */
-#include "conf.h"
+#include "ap_config.h"
#endif
1.11 +1 -1 apache-1.3/src/os/bs2000/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- os.h 1998/07/13 09:57:23 1.10
+++ os.h 1998/07/13 11:32:47 1.11
@@ -9,7 +9,7 @@
* and prototypes of OS specific functions defined in os.c or os-inline.c
*/
-#include "conf.h"
+#include "ap_config.h"
#if !defined(INLINE) && defined(USE_GNU_INLINE)
/* Compiler supports inline, so include the inlineable functions as
1.6 +1 -1 apache-1.3/src/os/emx/os-inline.c
Index: os-inline.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/emx/os-inline.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- os-inline.c 1998/04/13 18:05:18 1.5
+++ os-inline.c 1998/07/13 11:32:48 1.6
@@ -21,7 +21,7 @@
#define INLINE
/* Anything required only when compiling */
-#include "conf.h"
+#include "ap_config.h"
#endif
1.23 +6 -4 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.tmpl 1998/07/12 09:19:24 1.22
+++ Makefile.tmpl 1998/07/13 11:32:49 1.23
@@ -39,7 +39,9 @@
# DO NOT REMOVE
os-aix-dso.o: os-aix-dso.c
-os-inline.o: os-inline.c $(INCDIR)/conf.h \
- $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h
-os.o: os.c $(INCDIR)/conf.h $(INCDIR)/conf_auto.h \
- $(OSDIR)/os.h $(INCDIR)/apctype.h os.h
+os-inline.o: os-inline.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h
+os.o: os.c $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
+ os.h
1.7 +1 -1 apache-1.3/src/os/unix/os-inline.c
Index: os-inline.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os-inline.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- os-inline.c 1998/04/13 18:05:19 1.6
+++ os-inline.c 1998/07/13 11:32:49 1.7
@@ -21,7 +21,7 @@
#define INLINE
/* Anything required only when compiling */
-#include "conf.h"
+#include "ap_config.h"
#endif
1.13 +1 -1 apache-1.3/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- os.c 1998/07/10 18:29:50 1.12
+++ os.c 1998/07/13 11:32:49 1.13
@@ -3,7 +3,7 @@
* Any inlineable functions should be defined in os-inline.c instead.
*/
-#include "conf.h"
+#include "ap_config.h"
#include "os.h"
1.30 +1 -1 apache-1.3/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- os.h 1998/07/13 09:57:25 1.29
+++ os.h 1998/07/13 11:32:49 1.30
@@ -58,7 +58,7 @@
#ifndef APACHE_OS_H
#define APACHE_OS_H
-#include "conf.h"
+#include "ap_config.h"
#define PLATFORM "Unix"
1.5 +1 -1 apache-1.3/src/os/win32/multithread.c
Index: multithread.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/multithread.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multithread.c 1998/04/11 12:01:06 1.4
+++ multithread.c 1998/07/13 11:32:51 1.5
@@ -1,5 +1,5 @@
-#include "conf.h"
+#include "ap_config.h"
#include "multithread.h"
#ifdef WIN32
1.23 +1 -1 apache-1.3/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- os.h 1998/07/13 09:57:25 1.22
+++ os.h 1998/07/13 11:32:51 1.23
@@ -28,7 +28,7 @@
#define NO_USE_SIGACTION
#define NO_TIMES
#define NO_GETTIMEOFDAY
-//#define NEED_PROCESS_H although we do, this is specially handled in
conf.h
+//#define NEED_PROCESS_H although we do, this is specially handled in
ap_config.h
#define USE_LONGJMP
#define HAVE_MMAP
#define USE_MMAP_SCOREBOARD
1.5 +1 -1 apache-1.3/src/regex/engine.c
Index: engine.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/engine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- engine.c 1998/07/08 18:47:13 1.4
+++ engine.c 1998/07/13 11:32:52 1.5
@@ -46,7 +46,7 @@
};
#include "engine.ih"
-#include "apctype.h"
+#include "ap_ctype.h"
#ifdef REDEBUG
#define SP(t, s, c) print(m, t, s, c, stdout)
1.2 +2 -0 apache-1.3/src/regex/engine.ih
Index: engine.ih
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/engine.ih,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- engine.ih 1997/07/08 18:05:39 1.1
+++ engine.ih 1998/07/13 11:32:52 1.2
@@ -1,3 +1,5 @@
+/* DON'T EVEN THINK ABOUT EDITING THIS, go see regex/Makefile,
+ * search for mkh */
/* ========= begin header generated by ./mkh ========= */
#ifdef __cplusplus
extern "C" {
1.8 +1 -1 apache-1.3/src/regex/regcomp.c
Index: regcomp.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/regcomp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- regcomp.c 1998/07/08 18:47:13 1.7
+++ regcomp.c 1998/07/13 11:32:52 1.8
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include "hsregex.h"
-#include "apctype.h"
+#include "ap_ctype.h"
#include "utils.h"
#include "regex2.h"
1.2 +2 -0 apache-1.3/src/regex/regcomp.ih
Index: regcomp.ih
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/regcomp.ih,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- regcomp.ih 1997/07/08 18:05:40 1.1
+++ regcomp.ih 1998/07/13 11:32:55 1.2
@@ -1,3 +1,5 @@
+/* DON'T EVEN THINK ABOUT EDITING THIS, go see regex/Makefile,
+ * search for mkh */
/* ========= begin header generated by ./mkh ========= */
#ifdef __cplusplus
extern "C" {
1.2 +2 -0 apache-1.3/src/regex/regerror.ih
Index: regerror.ih
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/regerror.ih,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- regerror.ih 1997/07/08 18:05:41 1.1
+++ regerror.ih 1998/07/13 11:32:56 1.2
@@ -1,3 +1,5 @@
+/* DON'T EVEN THINK ABOUT EDITING THIS, go see regex/Makefile,
+ * search for mkh */
/* ========= begin header generated by ./mkh ========= */
#ifdef __cplusplus
extern "C" {
1.24 +16 -7 apache-1.3/src/support/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.tmpl 1998/06/20 11:07:38 1.23
+++ Makefile.tmpl 1998/07/13 11:32:57 1.24
@@ -62,10 +62,19 @@
$(OBJS): Makefile
# DO NOT REMOVE
-ab.o: ab.c $(INCDIR)/conf.h $(OSDIR)/os.h
-htdigest.o: htdigest.c $(INCDIR)/conf.h $(OSDIR)/os.h \
- ../main/md5c.c $(INCDIR)/ap_md5.h
-htpasswd.o: htpasswd.c $(INCDIR)/conf.h $(OSDIR)/os.h
-logresolve.o: logresolve.c $(INCDIR)/conf.h $(OSDIR)/os.h
-rotatelogs.o: rotatelogs.c $(INCDIR)/conf.h $(OSDIR)/os.h
-suexec.o: suexec.c $(INCDIR)/conf.h $(INCDIR)/ap.h $(OSDIR)/os.h suexec.h
+ab.o: ab.c $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h
+htdigest.o: htdigest.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h ../main/md5c.c $(INCDIR)/ap_md5.h
+htpasswd.o: htpasswd.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h
+logresolve.o: logresolve.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h
+rotatelogs.o: rotatelogs.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h
+suexec.o: suexec.c $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h suexec.h
1.9 +1 -1 apache-1.3/src/support/ab.c
Index: ab.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ab.c 1998/06/09 21:02:13 1.8
+++ ab.c 1998/07/13 11:32:57 1.9
@@ -89,7 +89,7 @@
/* affects include files on Solaris */
#define BSD_COMP
-#include "conf.h"
+#include "ap_config.h"
#include <fcntl.h>
#include <sys/time.h>
1.18 +1 -1 apache-1.3/src/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/htdigest.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- htdigest.c 1998/04/21 20:14:05 1.17
+++ htdigest.c 1998/07/13 11:32:58 1.18
@@ -10,7 +10,7 @@
* by Alexei Kosut, based on htpasswd.c, by Rob McCool
*/
-#include "conf.h"
+#include "ap_config.h"
#include <sys/types.h>
#ifdef MPE
#include <signal.h>
1.17 +1 -1 apache-1.3/src/support/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- htpasswd.c 1998/06/04 20:28:31 1.16
+++ htpasswd.c 1998/07/13 11:32:58 1.17
@@ -10,7 +10,7 @@
* Rob McCool
*/
-#include "conf.h"
+#include "ap_config.h"
#include <sys/types.h>
#include <signal.h>
1.16 +1 -1 apache-1.3/src/support/logresolve.c
Index: logresolve.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- logresolve.c 1998/06/06 03:17:55 1.15
+++ logresolve.c 1998/07/13 11:32:58 1.16
@@ -39,7 +39,7 @@
* that one of these matches the original address.
*/
-#include "conf.h"
+#include "ap_config.h"
#include <sys/types.h>
#include <ctype.h>
1.10 +1 -1 apache-1.3/src/support/rotatelogs.c
Index: rotatelogs.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/rotatelogs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rotatelogs.c 1998/04/21 20:14:06 1.9
+++ rotatelogs.c 1998/07/13 11:32:58 1.10
@@ -10,7 +10,7 @@
#define BUFSIZE 65536
#define MAX_PATH 1024
-#include "conf.h"
+#include "ap_config.h"
#include <time.h>
#include <errno.h>
#include <fcntl.h>
1.44 +1 -1 apache-1.3/src/support/suexec.c
Index: suexec.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/suexec.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- suexec.c 1998/07/07 23:19:24 1.43
+++ suexec.c 1998/07/13 11:32:59 1.44
@@ -71,7 +71,7 @@
*
*/
-#include "conf.h"
+#include "ap_config.h"
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
