ben 98/03/09 14:43:07
Modified: src ApacheCore.dsp ApacheCore.mak buildmark.c
src/include alloc.h httpd.h
src/main alloc.c util.c
src/modules/proxy proxy_util.c
src/modules/standard mod_rewrite.c mod_usertrack.c
src/os/win32 ApacheModuleRewrite.dsp ApacheModuleRewrite.mak
ApacheModuleStatus.mak
Log:
Make things work on Win32 again. May include unneed Makefile changes (or may
not, who can say?).
Revision Changes Path
1.23 +1 -1 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ApacheCore.dsp 1998/02/28 12:22:25 1.22
+++ ApacheCore.dsp 1998/03/09 22:42:50 1.23
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
+# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /map
/debug /machine:I386
!ENDIF
1.33 +134 -5 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ApacheCore.mak 1998/02/28 12:22:26 1.32
+++ ApacheCore.mak 1998/03/09 22:42:51 1.33
@@ -455,12 +455,21 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
".\include\multithread.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_ALLOC=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
@@ -478,6 +487,7 @@
".\include\http_log.h"\
".\include\httpd.h"\
".\include\multithread.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -498,6 +508,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -529,6 +540,7 @@
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -544,25 +556,65 @@
!IF "$(CFG)" == "ApacheCore - Win32 Release"
+DEP_CPP_BUILD=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\buff.h"\
+ ".\include\conf.h"\
+ ".\include\hide.h"\
+ ".\include\hsregex.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_BUILD=\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\include\sfio.h"\
+
-"$(INTDIR)\buildmark.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_BUILD=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\buff.h"\
+ ".\include\conf.h"\
+ ".\include\hsregex.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+
-"$(INTDIR)\buildmark.obj" "$(INTDIR)\buildmark.sbr" : $(SOURCE)
"$(INTDIR)"
+"$(INTDIR)\buildmark.obj" "$(INTDIR)\buildmark.sbr" : $(SOURCE)\
+ $(DEP_CPP_BUILD) "$(INTDIR)"
!ENDIF
SOURCE=.\main\fnmatch.c
-DEP_CPP_FNMAT=\
- ".\include\fnmatch.h"\
-
!IF "$(CFG)" == "ApacheCore - Win32 Release"
+DEP_CPP_FNMAT=\
+ ".\include\conf.h"\
+ ".\include\fnmatch.h"\
+ ".\include\hide.h"\
+ ".\include\hsregex.h"\
+ ".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_FNMAT=\
+ ".\include\os.h"\
+
"$(INTDIR)\fnmatch.obj" : $(SOURCE) $(DEP_CPP_FNMAT) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -570,6 +622,12 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_FNMAT=\
+ ".\include\conf.h"\
+ ".\include\fnmatch.h"\
+ ".\include\hsregex.h"\
+ ".\os\win32\os.h"\
+
"$(INTDIR)\fnmatch.obj" "$(INTDIR)\fnmatch.sbr" : $(SOURCE)
$(DEP_CPP_FNMAT)\
"$(INTDIR)"
@@ -605,6 +663,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -632,6 +691,7 @@
".\include\conf.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -653,6 +713,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -693,6 +754,7 @@
".\include\http_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -714,6 +776,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -766,6 +829,7 @@
".\include\rfc1413.h"\
".\include\scoreboard.h"\
".\include\util_md5.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -786,6 +850,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -821,6 +886,7 @@
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -842,6 +908,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\explain.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -919,6 +986,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -964,6 +1032,7 @@
".\include\http_vhost.h"\
".\include\httpd.h"\
".\include\util_date.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -985,6 +1054,7 @@
".\include\buff.h"\
".\include\conf.h"\
".\include\fnmatch.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1027,6 +1097,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\scoreboard.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1047,6 +1118,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1084,6 +1156,7 @@
".\include\http_protocol.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1101,6 +1174,7 @@
DEP_CPP_MD5C_=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\md5.h"\
".\os\win32\os.h"\
@@ -1140,6 +1214,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1175,6 +1250,7 @@
".\include\http_log.h"\
".\include\http_request.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1195,6 +1271,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1236,6 +1313,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1256,6 +1334,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1285,6 +1364,7 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1305,6 +1385,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -1344,6 +1425,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1364,6 +1446,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1399,6 +1482,7 @@
".\include\http_log.h"\
".\include\http_protocol.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1419,6 +1503,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1460,6 +1545,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1480,6 +1566,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -1523,6 +1610,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1543,6 +1631,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1584,6 +1673,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1604,6 +1694,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1633,6 +1724,7 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1653,6 +1745,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1694,6 +1787,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1714,6 +1808,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1757,6 +1852,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1777,6 +1873,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1815,6 +1912,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1835,6 +1933,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1868,6 +1967,7 @@
".\include\http_core.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1888,6 +1988,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -1918,6 +2019,7 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1939,6 +2041,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1976,6 +2079,7 @@
".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1996,6 +2100,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -2029,6 +2134,7 @@
".\include\http_core.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2049,6 +2155,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_log.h"\
@@ -2080,6 +2187,7 @@
".\include\http_config.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2100,6 +2208,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2129,6 +2238,7 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2149,6 +2259,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
@@ -2177,6 +2288,7 @@
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2194,6 +2306,7 @@
DEP_CPP_MULTI=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\multithread.h"\
".\os\win32\os.h"\
@@ -2256,6 +2369,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
@@ -2284,6 +2398,7 @@
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2304,6 +2419,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -2337,6 +2453,7 @@
".\include\http_main.h"\
".\include\httpd.h"\
".\include\rfc1413.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2357,6 +2474,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2393,6 +2511,7 @@
".\include\http_main.h"\
".\include\httpd.h"\
".\include\multithread.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\os\win32\registry.h"\
@@ -2415,6 +2534,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2446,6 +2566,7 @@
".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2463,6 +2584,7 @@
DEP_CPP_UTIL_D=\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
@@ -2502,6 +2624,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\md5.h"\
@@ -2533,6 +2656,7 @@
".\include\httpd.h"\
".\include\md5.h"\
".\include\util_md5.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2553,6 +2677,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_config.h"\
@@ -2598,6 +2723,7 @@
".\include\httpd.h"\
".\include\util_date.h"\
".\include\util_script.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -2618,6 +2744,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\http_conf_globals.h"\
".\include\http_log.h"\
@@ -2670,6 +2797,7 @@
".\include\ap.h"\
".\include\buff.h"\
".\include\conf.h"\
+ ".\include\hide.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -2696,6 +2824,7 @@
".\include\conf.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
+ ".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
1.4 +2 -2 apache-1.3/src/buildmark.c
Index: buildmark.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/buildmark.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildmark.c 1998/03/04 02:28:11 1.3
+++ buildmark.c 1998/03/09 22:42:52 1.4
@@ -61,12 +61,12 @@
#endif
static const char server_version[] = SERVER_VERSION;
-const char *apapi_get_server_built()
+API_EXPORT(const char *) apapi_get_server_built()
{
return server_built;
}
-const char *apapi_get_server_version()
+API_EXPORT(const char *) apapi_get_server_version()
{
return server_version;
}
1.47 +1 -1 apache-1.3/src/include/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- alloc.h 1998/03/04 09:57:27 1.46
+++ alloc.h 1998/03/09 22:42:54 1.47
@@ -218,7 +218,7 @@
/* A "do-nothing" cleanup, for register_cleanup; it's faster to do
* things this way than to test for NULL. */
-API_EXPORT(void) null_cleanup(void *data);
+API_EXPORT_NONSTD(void) null_cleanup(void *data);
/* The time between when a resource is actually allocated, and when it
* its cleanup is registered is a critical section, during which the
1.195 +4 -4 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.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- httpd.h 1998/03/07 21:39:30 1.194
+++ httpd.h 1998/03/09 22:42:56 1.195
@@ -363,8 +363,8 @@
#define SERVER_VERSION SERVER_BASEVERSION
#endif
-const char *apapi_get_server_version();
-const char *apapi_get_server_built();
+API_EXPORT(const char *) apapi_get_server_version(void);
+API_EXPORT(const char *) apapi_get_server_built(void);
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
@@ -800,8 +800,8 @@
*/
/* Time */
-extern MODULE_VAR_EXPORT const char month_snames[12][4];
-extern MODULE_VAR_EXPORT const char day_snames[7][4];
+extern API_VAR_EXPORT const char month_snames[12][4];
+extern API_VAR_EXPORT const char day_snames[7][4];
API_EXPORT(struct tm *) get_gmtoff(int *tz);
API_EXPORT(char *) get_time(void);
1.75 +1 -1 apache-1.3/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- alloc.c 1998/02/01 20:54:44 1.74
+++ alloc.c 1998/03/09 22:42:58 1.75
@@ -1314,7 +1314,7 @@
#endif /* ndef WIN32 */
}
-API_EXPORT(void) null_cleanup(void *data)
+API_EXPORT_NONSTD(void) null_cleanup(void *data)
{
/* do nothing cleanup routine */
}
1.98 +2 -2 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.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- util.c 1998/03/04 12:08:47 1.97
+++ util.c 1998/03/09 22:42:59 1.98
@@ -75,11 +75,11 @@
#endif
-const char month_snames[12][4] =
+API_VAR_EXPORT const char month_snames[12][4] =
{
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
"Nov", "Dec"
};
-const char day_snames[7][4] =
+API_VAR_EXPORT const char day_snames[7][4] =
{
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
1.49 +1 -1 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- proxy_util.c 1998/03/04 09:45:42 1.48
+++ proxy_util.c 1998/03/09 22:43:01 1.49
@@ -52,7 +52,7 @@
*/
/* Utility routines for Apache proxy */
-
+#define IS_MODULE
#include "mod_proxy.h"
#include "http_main.h"
#include "md5.h"
1.90 +4 -3 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mod_rewrite.c 1998/03/08 02:50:13 1.89
+++ mod_rewrite.c 1998/03/09 22:43:02 1.90
@@ -1120,8 +1120,9 @@
/* it was finally rewritten to a local path */
/* expand "/~user" prefix */
+#ifndef WIN32
r->filename = expand_tildepaths(r, r->filename);
-
+#endif
rewritelog(r, 2, "local path result: %s", r->filename);
/* the filename has to start with a slash! */
@@ -2316,7 +2317,7 @@
** Unix /etc/passwd database information
**
*/
-
+#ifndef WIN32
static char *expand_tildepaths(request_rec *r, char *uri)
{
char user[LONG_STRING_LEN];
@@ -2350,7 +2351,7 @@
}
return newuri;
}
-
+#endif
/*
**
1.27 +1 -0 apache-1.3/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_usertrack.c 1998/03/04 09:45:46 1.26
+++ mod_usertrack.c 1998/03/09 22:43:03 1.27
@@ -95,6 +95,7 @@
* This file replaces mod_cookies.c
*/
+#define IS_MODULE
#include "httpd.h"
#include "http_config.h"
#include "http_core.h"
1.9 +2 -6 apache-1.3/src/os/win32/ApacheModuleRewrite.dsp
Index: ApacheModuleRewrite.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApacheModuleRewrite.dsp 1998/02/05 12:29:12 1.8
+++ ApacheModuleRewrite.dsp 1998/03/09 22:43:05 1.9
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -104,10 +104,6 @@
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\mod_rewrite.h
-# End Source File
# Begin Source File
SOURCE=.\readdir.h
1.9 +20 -16 apache-1.3/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApacheModuleRewrite.mak 1998/02/05 12:29:07 1.8
+++ ApacheModuleRewrite.mak 1998/03/09 22:43:06 1.9
@@ -63,9 +63,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG"
/D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32"
/D\
+ "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fp"$(INTDIR)\ApacheModuleRewrite.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleRewriteR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -121,9 +121,10 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
- "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
+ "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP"\
+ /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
+ /FD /c
CPP_OBJS=.\ApacheModuleRewriteD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -191,16 +192,26 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_request.h"\
+ "..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\modules\standard\mod_rewrite.h"\
".\os.h"\
- ".\passwd.h"\
".\readdir.h"\
+ {$(INCLUDE)}"sys\locking.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_R=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
@@ -219,19 +230,12 @@
"..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_request.h"\
+ "..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\modules\standard\mod_rewrite.h"\
".\os.h"\
- ".\passwd.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\locking.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_R=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
1.10 +28 -1 apache-1.3/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApacheModuleStatus.mak 1998/02/05 12:29:08 1.9
+++ ApacheModuleStatus.mak 1998/03/09 22:43:06 1.10
@@ -185,6 +185,7 @@
"..\..\include\ap.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_core.h"\
@@ -194,8 +195,16 @@
"..\..\include\httpd.h"\
"..\..\include\scoreboard.h"\
"..\..\include\util_script.h"\
+ "..\..\include\util_uri.h"\
".\os.h"\
".\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_S=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
@@ -204,8 +213,26 @@
!ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
+DEP_CPP_MOD_S=\
+ "..\..\include\alloc.h"\
+ "..\..\include\ap.h"\
+ "..\..\include\buff.h"\
+ "..\..\include\conf.h"\
+ "..\..\include\hsregex.h"\
+ "..\..\include\http_config.h"\
+ "..\..\include\http_core.h"\
+ "..\..\include\http_log.h"\
+ "..\..\include\http_main.h"\
+ "..\..\include\http_protocol.h"\
+ "..\..\include\httpd.h"\
+ "..\..\include\scoreboard.h"\
+ "..\..\include\util_script.h"\
+ "..\..\include\util_uri.h"\
+ ".\os.h"\
+ ".\readdir.h"\
+
-"$(INTDIR)\mod_status.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
