randy 97/08/22 21:00:38
Modified: src Apache.mak ApacheCore.mak Configure
src/main http_config.c http_config.h
src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
Log:
More cleanup for core -> main.
Revision Changes Path
1.5 +1 -1 apachen/src/Apache.mak
Index: Apache.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/Apache.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Apache.mak 1997/08/13 08:37:13 1.4
+++ Apache.mak 1997/08/23 04:00:16 1.5
@@ -159,7 +159,7 @@
!IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32
Debug"
-SOURCE=.\core\dummy.c
+SOURCE=.\main\dummy.c
"$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.14 +577 -577 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApacheCore.mak 1997/08/18 11:10:19 1.13
+++ ApacheCore.mak 1997/08/23 04:00:18 1.14
@@ -101,7 +101,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\core" /D "WIN32" /D\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreR/
@@ -284,7 +284,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\core" /D
"WIN32"\
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D
"WIN32"\
/D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch"
/YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreD/
@@ -434,16 +434,16 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
-SOURCE=.\core\alloc.c
+SOURCE=.\main\alloc.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_ALLOC=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
- ".\core\multithread.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
+ ".\main\multithread.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -455,11 +455,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_ALLOC=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
- ".\core\multithread.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
+ ".\main\multithread.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -471,16 +471,16 @@
!ENDIF
-SOURCE=.\core\buff.c
+SOURCE=.\main\buff.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_BUFF_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_main.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_main.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -492,11 +492,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_BUFF_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_main.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_main.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -508,9 +508,9 @@
!ENDIF
-SOURCE=.\core\explain.c
+SOURCE=.\main\explain.c
DEP_CPP_EXPLA=\
- ".\core\explain.h"\
+ ".\main\explain.h"\
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -530,9 +530,9 @@
!ENDIF
-SOURCE=.\core\fnmatch.c
+SOURCE=.\main\fnmatch.c
DEP_CPP_FNMAT=\
- ".\core\fnmatch.h"\
+ ".\main\fnmatch.h"\
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -570,15 +570,15 @@
!ENDIF
-SOURCE=.\core\http_bprintf.c
+SOURCE=.\main\http_bprintf.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -590,10 +590,10 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -605,21 +605,21 @@
!ENDIF
-SOURCE=.\core\http_config.c
+SOURCE=.\main\http_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_C=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\explain.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\explain.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -631,16 +631,16 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_C=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\explain.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\explain.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -652,26 +652,26 @@
!ENDIF
-SOURCE=.\core\http_core.c
+SOURCE=.\main\http_core.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_CO=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\fnmatch.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\httpd.h"\
- ".\core\md5.h"\
- ".\core\rfc1413.h"\
- ".\core\scoreboard.h"\
- ".\core\util_md5.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\fnmatch.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\httpd.h"\
+ ".\main\md5.h"\
+ ".\main\rfc1413.h"\
+ ".\main\scoreboard.h"\
+ ".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -683,21 +683,21 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_CO=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\fnmatch.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\httpd.h"\
- ".\core\md5.h"\
- ".\core\rfc1413.h"\
- ".\core\scoreboard.h"\
- ".\core\util_md5.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\fnmatch.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\httpd.h"\
+ ".\main\md5.h"\
+ ".\main\rfc1413.h"\
+ ".\main\scoreboard.h"\
+ ".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -709,18 +709,18 @@
!ENDIF
-SOURCE=.\core\http_log.c
+SOURCE=.\main\http_log.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_L=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -732,13 +732,13 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_L=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -750,25 +750,25 @@
!ENDIF
-SOURCE=.\core\http_main.c
+SOURCE=.\main\http_main.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\explain.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\multithread.h"\
- ".\core\scoreboard.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\explain.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\multithread.h"\
+ ".\main\scoreboard.h"\
".\os\win32\getopt.h"\
".\os\win32\readdir.h"\
".\os\win32\service.h"\
@@ -782,20 +782,20 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\explain.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\multithread.h"\
- ".\core\scoreboard.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\explain.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\multithread.h"\
+ ".\main\scoreboard.h"\
".\os\win32\getopt.h"\
".\os\win32\readdir.h"\
".\os\win32\service.h"\
@@ -809,22 +809,22 @@
!ENDIF
-SOURCE=.\core\http_protocol.c
+SOURCE=.\main\http_protocol.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_P=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\httpd.h"\
- ".\core\util_date.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\httpd.h"\
+ ".\main\util_date.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -836,18 +836,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_P=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_date.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_date.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -859,23 +859,23 @@
!ENDIF
-SOURCE=.\core\http_request.c
+SOURCE=.\main\http_request.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_R=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\fnmatch.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\scoreboard.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\fnmatch.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\scoreboard.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -887,18 +887,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_R=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\fnmatch.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\scoreboard.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\fnmatch.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\scoreboard.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -910,10 +910,10 @@
!ENDIF
-SOURCE=.\core\md5c.c
+SOURCE=.\main\md5c.c
DEP_CPP_MD5C_=\
- ".\core\conf.h"\
- ".\core\md5.h"\
+ ".\main\conf.h"\
+ ".\main\md5.h"\
".\regex\regex.h"\
@@ -939,14 +939,14 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_A=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -958,14 +958,14 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_A=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -982,17 +982,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AC=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1004,17 +1004,17 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AC=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1031,11 +1031,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1047,11 +1047,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1068,16 +1068,16 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AS=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1089,16 +1089,16 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AS=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1115,14 +1115,14 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AU=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_protocol.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_protocol.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1134,14 +1134,14 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AU=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_protocol.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_protocol.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1158,17 +1158,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AUT=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1180,17 +1180,17 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AUT=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1207,18 +1207,18 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_C=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1230,18 +1230,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_C=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1258,17 +1258,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_D=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1280,17 +1280,17 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_D=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1307,11 +1307,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_DL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1323,11 +1323,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_DL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1344,11 +1344,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_E=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1360,11 +1360,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_E=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1381,17 +1381,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_I=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1403,17 +1403,17 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_I=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1430,17 +1430,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_IN=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1452,17 +1452,17 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_IN=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1479,16 +1479,16 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_IS=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1500,16 +1500,16 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_IS=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1526,12 +1526,12 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_L=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1543,12 +1543,12 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_L=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1565,11 +1565,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1582,11 +1582,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1604,15 +1604,15 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_N=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1624,15 +1624,15 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_N=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1649,13 +1649,13 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_S=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1667,13 +1667,13 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_S=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1690,11 +1690,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_U=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1706,11 +1706,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_U=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1727,11 +1727,11 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MODUL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1743,11 +1743,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MODUL=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_config.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_config.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1761,8 +1761,8 @@
SOURCE=.\os\win32\multithread.c
DEP_CPP_MULTI=\
- ".\core\conf.h"\
- ".\core\multithread.h"\
+ ".\main\conf.h"\
+ ".\main\multithread.h"\
".\regex\regex.h"\
@@ -1805,18 +1805,18 @@
!ENDIF
-SOURCE=.\core\rfc1413.c
+SOURCE=.\main\rfc1413.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_RFC14=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\httpd.h"\
- ".\core\rfc1413.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\httpd.h"\
+ ".\main\rfc1413.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1828,13 +1828,13 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_RFC14=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\httpd.h"\
- ".\core\rfc1413.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\httpd.h"\
+ ".\main\rfc1413.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1848,8 +1848,8 @@
SOURCE=.\os\win32\service.c
DEP_CPP_SERVI=\
- ".\core\conf.h"\
- ".\core\multithread.h"\
+ ".\main\conf.h"\
+ ".\main\multithread.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
@@ -1871,16 +1871,16 @@
!ENDIF
-SOURCE=.\core\util.c
+SOURCE=.\main\util.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1892,11 +1892,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1908,10 +1908,10 @@
!ENDIF
-SOURCE=.\core\util_date.c
+SOURCE=.\main\util_date.c
DEP_CPP_UTIL_D=\
- ".\core\conf.h"\
- ".\core\util_date.h"\
+ ".\main\conf.h"\
+ ".\main\util_date.h"\
".\regex\regex.h"\
@@ -1932,17 +1932,17 @@
!ENDIF
-SOURCE=.\core\util_md5.c
+SOURCE=.\main\util_md5.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
- ".\core\md5.h"\
- ".\core\util_md5.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
+ ".\main\md5.h"\
+ ".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1954,12 +1954,12 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_M=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
- ".\core\md5.h"\
- ".\core\util_md5.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
+ ".\main\md5.h"\
+ ".\main\util_md5.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1971,23 +1971,23 @@
!ENDIF
-SOURCE=.\core\util_script.c
+SOURCE=.\main\util_script.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_S=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -1999,18 +1999,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_S=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\http_conf_globals.h"\
- ".\core\http_config.h"\
- ".\core\http_core.h"\
- ".\core\http_log.h"\
- ".\core\http_main.h"\
- ".\core\http_protocol.h"\
- ".\core\http_request.h"\
- ".\core\httpd.h"\
- ".\core\util_script.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\http_conf_globals.h"\
+ ".\main\http_config.h"\
+ ".\main\http_core.h"\
+ ".\main\http_log.h"\
+ ".\main\http_main.h"\
+ ".\main\http_protocol.h"\
+ ".\main\http_request.h"\
+ ".\main\httpd.h"\
+ ".\main\util_script.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
@@ -2022,9 +2022,9 @@
!ENDIF
-SOURCE=.\core\util_snprintf.c
+SOURCE=.\main\util_snprintf.c
DEP_CPP_UTIL_SN=\
- ".\core\conf.h"\
+ ".\main\conf.h"\
".\regex\regex.h"\
@@ -2050,17 +2050,17 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_W=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_UTIL_W=\
- ".\core\sfio.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
@@ -2070,10 +2070,10 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_W=\
- ".\core\alloc.h"\
- ".\core\buff.h"\
- ".\core\conf.h"\
- ".\core\httpd.h"\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
1.138 +4 -4 apachen/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- Configure 1997/08/21 18:12:17 1.137
+++ Configure 1997/08/23 04:00:19 1.138
@@ -833,7 +833,7 @@
#
echo >> Makefile
echo "CFLAGS1=$CFLAGS">> Makefile.config
-echo "INCLUDES1=$INCLUDES -I${SRCDIR}/core">> Makefile.config
+echo "INCLUDES1=$INCLUDES -I${SRCDIR}/main">> Makefile.config
echo "LIBS1=$LIBS">> Makefile.config
echo "LDFLAGS1=$LDFLAGS">> Makefile.config
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
@@ -845,7 +845,7 @@
echo >> Makefile.config
echo "#### End of Configure created section ####">> Makefile.config
-cp $OSDIR/os.h core/os.h
+cp $OSDIR/os.h main/os.h
####################################################################
# Use TestCompile to see if $(CC) is ANSI and as a "final" sanity
@@ -877,7 +877,7 @@
#
# directories to create makefiles in
#
-MAKEDIRS="support core $OSDIR"
+MAKEDIRS="support main $OSDIR"
for dir in $MAKEDIRS ; do
echo Creating Makefile in $dir
cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile
@@ -950,7 +950,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../../core
+INCDIR=../../main
all: $(OBJS)
1.74 +15 -0 apachen/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- http_config.c 1997/08/18 07:17:24 1.73
+++ http_config.c 1997/08/23 04:00:27 1.74
@@ -825,6 +825,21 @@
return NULL;
}
+const char *set_file_slot (cmd_parms *cmd, char *struct_ptr, char *arg)
+{
+ /* Prepend server_root to relative arg.
+ This allows .htaccess to be independent of server_root,
+ so the server can be moved or mirrored with less pain. */
+ char *p;
+ int offset = (int)cmd->info;
+ if (*arg == '/')
+ p = pstrdup (cmd->pool, arg);
+ else
+ p = make_full_path (cmd->pool, server_root, arg);
+ *(char **)(struct_ptr + offset) = p;
+ return NULL;
+}
+
/*****************************************************************
*
* Reading whole config files...
1.45 +1 -0 apachen/src/main/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_config.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- http_config.h 1997/08/18 07:17:24 1.44
+++ http_config.h 1997/08/23 04:00:28 1.45
@@ -260,6 +260,7 @@
API_EXPORT_NONSTD(const char *) set_string_slot (cmd_parms *, char *, char
*);
API_EXPORT_NONSTD(const char *) set_flag_slot (cmd_parms *, char *, int);
+API_EXPORT_NONSTD(const char *) set_file_slot (cmd_parms *, char *, char *);
/* For modules which need to read config files, open logs, etc. ...
* this returns the fname argument if it begins with '/'; otherwise
1.25 +1 -1 apachen/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_auth.c 1997/08/18 13:12:08 1.24
+++ mod_auth.c 1997/08/23 04:00:34 1.25
@@ -94,7 +94,7 @@
if (t && strcmp(t, "standard"))
return pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL);
- return set_string_slot(cmd, offset, f);
+ return set_file_slot(cmd, offset, f);
}
static command_rec auth_cmds[] = {
1.20 +3 -3 apachen/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_auth_db.c 1997/08/18 13:12:09 1.19
+++ mod_auth_db.c 1997/08/23 04:00:35 1.20
@@ -109,14 +109,14 @@
if (!t || strcmp(t, "db"))
return DECLINE_CMD;
- return set_string_slot(cmd, offset, f);
+ return set_file_slot(cmd, offset, f);
}
static command_rec db_auth_cmds[] = {
-{ "AuthDBUserFile", set_string_slot,
+{ "AuthDBUserFile", set_file_slot,
(void*)XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
OR_AUTHCFG, TAKE1, NULL },
-{ "AuthDBGroupFile", set_string_slot,
+{ "AuthDBGroupFile", set_file_slot,
(void*)XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
OR_AUTHCFG, TAKE1, NULL },
{ "AuthUserFile", set_db_slot,
1.26 +3 -3 apachen/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_auth_dbm.c 1997/08/21 18:12:23 1.25
+++ mod_auth_dbm.c 1997/08/23 04:00:35 1.26
@@ -125,14 +125,14 @@
if (!t || strcmp(t, "dbm"))
return DECLINE_CMD;
- return set_string_slot(cmd, offset, f);
+ return set_file_slot(cmd, offset, f);
}
static command_rec dbm_auth_cmds[] = {
-{ "AuthDBMUserFile", set_string_slot,
+{ "AuthDBMUserFile", set_file_slot,
(void*)XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
OR_AUTHCFG, TAKE1, NULL },
-{ "AuthDBMGroupFile", set_string_slot,
+{ "AuthDBMGroupFile", set_file_slot,
(void*)XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
OR_AUTHCFG, TAKE1, NULL },
{ "AuthUserFile", set_dbm_slot,
