httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/support htdigest.mak htpasswd.mak rotatelogs.dsp rotatelogs.mak
Date Wed, 28 Mar 2001 23:18:27 GMT
wrowe       01/03/28 15:18:25

  Modified:    src      ApacheCore.mak
               src/ap   ap.mak
               src/main gen_test_char.mak
               src/os/win32 ApacheOS.dsp mod_auth_anon.mak mod_auth_dbm.mak
                        mod_auth_digest.mak mod_cern_meta.mak
                        mod_digest.mak mod_expires.mak mod_headers.mak
                        mod_info.mak mod_proxy.mak mod_rewrite.mak
                        mod_speling.mak mod_status.mak mod_usertrack.mak
                        os.c util_win32.c
               src/support htdigest.mak htpasswd.mak rotatelogs.dsp
                        rotatelogs.mak
  Log:
    Appears strftime wasn't adaquate on win32 (nor were stat and spawn), but
    any 3rd party anything needs these same sources we use for the core.
  
    Rather than linking to the core, this patch moves that family into the
    ApacheOS library.
  
  Revision  Changes    Path
  1.50      +37 -37    apache-1.3/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ApacheCore.mak	2000/12/21 07:24:31	1.49
  +++ ApacheCore.mak	2001/03/28 23:17:08	1.50
  @@ -368,6 +368,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -380,7 +381,6 @@
   	
   NODEP_CPP_ALLOC=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -394,6 +394,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -406,7 +407,6 @@
   	
   NODEP_CPP_BUFF_=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -420,6 +420,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -430,7 +431,6 @@
   	
   NODEP_CPP_BUILD=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -449,6 +449,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\explain.h"\
  @@ -466,7 +467,6 @@
   	
   NODEP_CPP_HTTP_=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -480,6 +480,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_md5.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  @@ -503,7 +504,6 @@
   	
   NODEP_CPP_HTTP_C=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -517,6 +517,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -532,7 +533,6 @@
   	
   NODEP_CPP_HTTP_L=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -546,6 +546,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\explain.h"\
  @@ -571,7 +572,6 @@
   	
   NODEP_CPP_HTTP_M=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	".\main\xmlparse.h"\
   	
  @@ -586,6 +586,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -605,7 +606,6 @@
   	
   NODEP_CPP_HTTP_P=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -619,6 +619,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\fnmatch.h"\
  @@ -638,7 +639,6 @@
   	
   NODEP_CPP_HTTP_R=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -652,6 +652,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -667,7 +668,6 @@
   	
   NODEP_CPP_HTTP_V=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -681,6 +681,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -695,7 +696,6 @@
   	
   NODEP_CPP_MOD_A=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -709,6 +709,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -726,7 +727,6 @@
   	
   NODEP_CPP_MOD_AC=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -740,6 +740,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -751,7 +752,6 @@
   	
   NODEP_CPP_MOD_AL=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -765,6 +765,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -781,7 +782,6 @@
   	
   NODEP_CPP_MOD_AS=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -795,6 +795,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -809,7 +810,6 @@
   	
   NODEP_CPP_MOD_AU=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -823,6 +823,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\fnmatch.h"\
  @@ -841,7 +842,6 @@
   	
   NODEP_CPP_MOD_AUT=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -855,6 +855,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -873,7 +874,6 @@
   	
   NODEP_CPP_MOD_C=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -887,6 +887,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -904,7 +905,6 @@
   	
   NODEP_CPP_MOD_D=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -918,6 +918,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -929,7 +930,6 @@
   	
   NODEP_CPP_MOD_E=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -943,6 +943,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -960,7 +961,6 @@
   	
   NODEP_CPP_MOD_I=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -974,6 +974,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -991,7 +992,6 @@
   	
   NODEP_CPP_MOD_IN=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	".\modules\standard\config.h"\
   	".\modules\standard\modules\perl\mod_perl.h"\
  @@ -1007,6 +1007,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1023,7 +1024,6 @@
   	
   NODEP_CPP_MOD_IS=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1037,6 +1037,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1050,7 +1051,6 @@
   	
   NODEP_CPP_MOD_L=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1064,6 +1064,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1076,7 +1077,6 @@
   	
   NODEP_CPP_MOD_M=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1090,6 +1090,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1106,7 +1107,6 @@
   	
   NODEP_CPP_MOD_N=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1120,6 +1120,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1133,7 +1134,6 @@
   	
   NODEP_CPP_MOD_S=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1147,6 +1147,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1159,7 +1160,6 @@
   	
   NODEP_CPP_MOD_SO=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1173,6 +1173,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1184,7 +1185,6 @@
   	
   NODEP_CPP_MOD_U=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1198,6 +1198,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1209,7 +1210,6 @@
   	
   NODEP_CPP_MODUL=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1249,6 +1249,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1260,7 +1261,6 @@
   	
   NODEP_CPP_REGIS=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1274,6 +1274,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1287,7 +1288,6 @@
   	
   NODEP_CPP_RFC14=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1301,6 +1301,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1318,7 +1319,6 @@
   	
   NODEP_CPP_SERVI=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1332,6 +1332,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1345,7 +1346,6 @@
   	
   NODEP_CPP_UTIL_=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1376,6 +1376,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_md5.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  @@ -1388,7 +1389,6 @@
   	
   NODEP_CPP_UTIL_M=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1402,6 +1402,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1421,7 +1422,6 @@
   	
   NODEP_CPP_UTIL_S=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1435,6 +1435,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1448,7 +1449,6 @@
   	
   NODEP_CPP_UTIL_U=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  @@ -1462,6 +1462,7 @@
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  +	".\include\ap_ebcdic.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  @@ -1473,7 +1474,6 @@
   	
   NODEP_CPP_UTIL_W=\
   	".\include\ap_config_auto.h"\
  -	".\include\ebcdic.h"\
   	".\include\sfio.h"\
   	
   
  
  
  
  1.16      +7 -7      apache-1.3/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ap.mak	2000/12/21 07:24:32	1.15
  +++ ap.mak	2001/03/28 23:17:12	1.16
  @@ -189,13 +189,13 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
   NODEP_CPP_AP_BA=\
   	"..\include\ap_config_auto.h"\
  -	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  @@ -225,6 +225,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -235,7 +236,6 @@
   	
   NODEP_CPP_AP_CP=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  @@ -263,6 +263,7 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  @@ -270,7 +271,6 @@
   	
   NODEP_CPP_AP_MD=\
   	"..\include\ap_config_auto.h"\
  -	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  @@ -281,6 +281,7 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  @@ -288,7 +289,6 @@
   	
   NODEP_CPP_AP_SH=\
   	"..\include\ap_config_auto.h"\
  -	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  @@ -300,6 +300,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -310,7 +311,6 @@
   	
   NODEP_CPP_AP_SI=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  @@ -323,6 +323,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -334,7 +335,6 @@
   	
   NODEP_CPP_AP_SL=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  @@ -347,6 +347,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -357,7 +358,6 @@
   	
   NODEP_CPP_AP_SN=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  
  
  
  1.12      +1 -1      apache-1.3/src/main/gen_test_char.mak
  
  Index: gen_test_char.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- gen_test_char.mak	2000/12/21 07:24:33	1.11
  +++ gen_test_char.mak	2001/03/28 23:17:15	1.12
  @@ -195,6 +195,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -205,7 +206,6 @@
   	
   NODEP_CPP_GEN_T=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  
  
  
  1.12      +2 -0      apache-1.3/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheOS.dsp	2001/02/14 14:45:55	1.11
  +++ ApacheOS.dsp	2001/03/28 23:17:18	1.12
  @@ -39,6 +39,7 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  +RSC=rc.exe
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"LibR\ApacheOS" /FD /c
   BSC32=bscmake.exe
  @@ -60,6 +61,7 @@
   # PROP Output_Dir "LibD"
   # PROP Intermediate_Dir "LibD"
   # PROP Target_Dir ""
  +RSC=rc.exe
   # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"LibD\ApacheOS" /FD /c
   BSC32=bscmake.exe
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_auth_anon.mak
  
  Index: mod_auth_anon.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_anon.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_anon.mak	2001/02/26 21:32:38	1.2
  +++ mod_auth_anon.mak	2001/03/28 23:17:19	1.3
  @@ -219,6 +219,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -234,7 +235,6 @@
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_auth_dbm.mak
  
  Index: mod_auth_dbm.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_dbm.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_dbm.mak	2001/02/26 21:32:39	1.2
  +++ mod_auth_dbm.mak	2001/03/28 23:17:19	1.3
  @@ -251,6 +251,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -266,7 +267,6 @@
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_auth_digest.mak
  
  Index: mod_auth_digest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_digest.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_digest.mak	2001/02/26 21:32:41	1.2
  +++ mod_auth_digest.mak	2001/03/28 23:17:20	1.3
  @@ -221,6 +221,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_md5.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\ap_sha1.h"\
  @@ -240,7 +241,6 @@
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	"..\..\modules\experimental\mm.h"\
   	
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_cern_meta.mak
  
  Index: mod_cern_meta.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_cern_meta.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_cern_meta.mak	2001/02/26 21:32:43	1.2
  +++ mod_cern_meta.mak	2001/03/28 23:17:21	1.3
  @@ -219,6 +219,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -233,7 +234,6 @@
   	
   NODEP_CPP_MOD_C=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_digest.mak
  
  Index: mod_digest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_digest.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_digest.mak	2001/02/26 21:32:44	1.2
  +++ mod_digest.mak	2001/03/28 23:17:22	1.3
  @@ -218,6 +218,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_md5.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
  @@ -234,7 +235,6 @@
   	
   NODEP_CPP_MOD_D=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_expires.mak
  
  Index: mod_expires.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_expires.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_expires.mak	2001/02/26 21:32:44	1.2
  +++ mod_expires.mak	2001/03/28 23:17:22	1.3
  @@ -218,6 +218,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -230,7 +231,6 @@
   	
   NODEP_CPP_MOD_E=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_headers.mak
  
  Index: mod_headers.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_headers.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_headers.mak	2001/02/26 21:32:45	1.2
  +++ mod_headers.mak	2001/03/28 23:17:23	1.3
  @@ -218,6 +218,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -229,7 +230,6 @@
   	
   NODEP_CPP_MOD_H=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_info.mak
  
  Index: mod_info.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_info.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_info.mak	2001/02/26 21:32:47	1.2
  +++ mod_info.mak	2001/03/28 23:17:24	1.3
  @@ -217,6 +217,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -234,7 +235,6 @@
   	
   NODEP_CPP_MOD_I=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.4       +35 -69    apache-1.3/src/os/win32/mod_proxy.mak
  
  Index: mod_proxy.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_proxy.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_proxy.mak	2001/02/26 21:32:49	1.3
  +++ mod_proxy.mak	2001/03/28 23:17:24	1.4
  @@ -28,6 +28,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "mod_proxy - Win32 Release"
   
   OUTDIR=.\Release
  @@ -66,46 +70,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
    /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
   BSC32_SBRS= \
  @@ -168,13 +138,37 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
    /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
  + /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
  +LINK32_OBJS= \
  +	"$(INTDIR)\mod_proxy.obj" \
  +	"$(INTDIR)\proxy_cache.obj" \
  +	"$(INTDIR)\proxy_connect.obj" \
  +	"$(INTDIR)\proxy_ftp.obj" \
  +	"$(INTDIR)\proxy_http.obj" \
  +	"$(INTDIR)\proxy_util.obj" \
  +	"..\..\Debug\ApacheCore.lib"
   
  +"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -205,34 +199,6 @@
      $(CPP_PROJ) $< 
   <<
   
  -MTL=midl.exe
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
  - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
  - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
  -LINK32_OBJS= \
  -	"$(INTDIR)\mod_proxy.obj" \
  -	"$(INTDIR)\proxy_cache.obj" \
  -	"$(INTDIR)\proxy_connect.obj" \
  -	"$(INTDIR)\proxy_ftp.obj" \
  -	"$(INTDIR)\proxy_http.obj" \
  -	"$(INTDIR)\proxy_util.obj" \
  -	"..\..\Debug\ApacheCore.lib"
  -
  -"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   
   !IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\
    "mod_proxy - Win32 Debug"
  @@ -242,6 +208,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\explain.h"\
  @@ -259,7 +226,6 @@
   	
   NODEP_CPP_MOD_P=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -273,6 +239,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_md5.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
  @@ -293,7 +260,6 @@
   	
   NODEP_CPP_PROXY=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -307,6 +273,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\explain.h"\
  @@ -323,7 +290,6 @@
   	
   NODEP_CPP_PROXY_=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -337,6 +303,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\explain.h"\
  @@ -354,7 +321,6 @@
   	
   NODEP_CPP_PROXY_F=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -368,6 +334,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\explain.h"\
  @@ -386,7 +353,6 @@
   	
   NODEP_CPP_PROXY_H=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -400,6 +366,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_md5.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
  @@ -419,7 +386,6 @@
   	
   NODEP_CPP_PROXY_U=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_rewrite.mak
  
  Index: mod_rewrite.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_rewrite.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_rewrite.mak	2001/02/26 21:32:50	1.2
  +++ mod_rewrite.mak	2001/03/28 23:17:27	1.3
  @@ -222,6 +222,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -239,7 +240,6 @@
   	
   NODEP_CPP_MOD_R=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_speling.mak
  
  Index: mod_speling.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_speling.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_speling.mak	2001/02/26 21:32:52	1.2
  +++ mod_speling.mak	2001/03/28 23:17:28	1.3
  @@ -218,6 +218,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -231,7 +232,6 @@
   	
   NODEP_CPP_MOD_S=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_status.mak
  
  Index: mod_status.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_status.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_status.mak	2001/02/26 21:32:53	1.2
  +++ mod_status.mak	2001/03/28 23:17:30	1.3
  @@ -218,6 +218,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -236,7 +237,6 @@
   	
   NODEP_CPP_MOD_S=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/mod_usertrack.mak
  
  Index: mod_usertrack.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_usertrack.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_usertrack.mak	2001/02/26 21:32:54	1.2
  +++ mod_usertrack.mak	2001/03/28 23:17:33	1.3
  @@ -219,6 +219,7 @@
   	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  +	"..\..\include\ap_ebcdic.h"\
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\hsregex.h"\
  @@ -231,7 +232,6 @@
   	
   NODEP_CPP_MOD_U=\
   	"..\..\include\ap_config_auto.h"\
  -	"..\..\include\ebcdic.h"\
   	"..\..\include\sfio.h"\
   	
   
  
  
  
  1.5       +263 -0    apache-1.3/src/os/win32/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.c	2001/02/14 14:22:10	1.4
  +++ os.c	2001/03/28 23:17:36	1.5
  @@ -61,5 +61,268 @@
    * as "__inline" in os.h.
    */
   
  +#include <sys/stat.h>
  +#include <stdio.h>
  +#include <time.h>
   #include "os.h"
   
  +/* Win95 doesn't like trailing /s. NT and Unix don't mind. This works 
  + * around the problem.
  + * Errr... except if it is UNC and we are referring to the root of 
  + * the UNC, we MUST have a trailing \ and we can't use /s. Jeez. 
  + * Not sure if this refers to all UNCs or just roots,
  + * but I'm going to fix it for all cases for now. (Ben)
  + */
  +
  +#undef stat
  +API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat)
  +{
  +    int n;
  +    int len = strlen(szPath);
  +    
  +    if ((len == 0) || (len >= MAX_PATH)) {
  +        return -1;
  +    }
  +
  +    if (szPath[0] == '/' && szPath[1] == '/') {
  +	char buf[_MAX_PATH];
  +	char *s;
  +	int nSlashes = 0;
  +
  +	strcpy(buf, szPath);
  +	for (s = buf; *s; ++s) {
  +	    if (*s == '/') {
  +		*s = '\\';
  +		++nSlashes;
  +	    }
  +	}
  +	/* then we need to add one more to get \\machine\share\ */
  +	if (nSlashes == 3) {
  +            if (++len >= MAX_PATH) {
  +                return -1;
  +            }
  +	    *s++ = '\\';
  +	}
  +	*s = '\0';
  +	return stat(buf, pStat);
  +    }
  +
  +    /*
  +     * Below removes the trailing /, however, do not remove
  +     * it in the case of 'x:/' or stat will fail
  +     */
  +    n = strlen(szPath);
  +    if ((szPath[n - 1] == '\\' || szPath[n - 1] == '/') &&
  +        !(n == 3 && szPath[1] == ':')) {
  +        char buf[MAX_PATH];
  +        
  +        strcpy(buf, szPath);
  +        buf[n - 1] = '\0';
  +        
  +        return stat(buf, pStat);
  +    }
  +    return stat(szPath, pStat);
  +}
  +
  +/* Fix two really crap problems with Win32 spawn[lv]e*:
  + *
  + *  1. Win32 doesn't deal with spaces in argv.
  + *  2. Win95 doesn't like / in cmdname.
  + */
  +
  +#undef _spawnv
  +API_EXPORT(int) os_spawnv(int mode, const char *cmdname,
  +			  const char *const *argv)
  +{
  +    int n;
  +    char **aszArgs;
  +    const char *szArg;
  +    char *szCmd;
  +    char *s;
  +    
  +    szCmd = _alloca(strlen(cmdname)+1);
  +    strcpy(szCmd, cmdname);
  +    for (s = szCmd; *s; ++s) {
  +        if (*s == '/') {
  +            *s = '\\';
  +	}
  +    }
  +
  +    for (n = 0; argv[n]; ++n)
  +        ;
  +
  +    aszArgs = _alloca((n + 1) * sizeof(const char *));
  +
  +    for (n = 0; szArg = argv[n]; ++n) {
  +        if (strchr(szArg, ' ')) {
  +            int l = strlen(szArg);
  +
  +            aszArgs[n] = _alloca(l + 2 + 1);
  +            aszArgs[n][0] = '"';
  +            strcpy(&aszArgs[n][1], szArg);
  +            aszArgs[n][l + 1] = '"';
  +            aszArgs[n][l + 2] = '\0';
  +        }
  +        else {
  +            aszArgs[n] = (char *)szArg;
  +        }
  +    }
  +
  +    aszArgs[n] = NULL;
  +
  +    return _spawnv(mode, szCmd, aszArgs);
  +}
  +
  +#undef _spawnve
  +API_EXPORT(int) os_spawnve(int mode, const char *cmdname,
  +			   const char *const *argv, const char *const *envp)
  +{
  +    int n;
  +    char **aszArgs;
  +    const char *szArg;
  +    char *szCmd;
  +    char *s;
  +    
  +    szCmd = _alloca(strlen(cmdname)+1);
  +    strcpy(szCmd, cmdname);
  +    for (s = szCmd; *s; ++s) {
  +        if (*s == '/') {
  +            *s = '\\';
  +	}
  +    }
  +    
  +    for (n = 0; argv[n]; ++n)
  +        ;
  +
  +    aszArgs = _alloca((n + 1)*sizeof(const char *));
  +
  +    for (n = 0; szArg = argv[n]; ++n){
  +        if (strchr(szArg, ' ')) {
  +            int l = strlen(szArg);
  +
  +            aszArgs[n] = _alloca(l + 2 + 1);
  +            aszArgs[n][0] = '"';
  +            strcpy(&aszArgs[n][1], szArg);
  +            aszArgs[n][l + 1] = '"';
  +            aszArgs[n][l + 2] = '\0';
  +        }
  +        else {
  +            aszArgs[n] = (char *)szArg;
  +        }
  +    }
  +
  +    aszArgs[n] = NULL;
  +
  +    return _spawnve(mode, szCmd, aszArgs, envp);
  +}
  +
  +API_EXPORT_NONSTD(int) os_spawnle(int mode, const char *cmdname, ...)
  +{
  +    int n;
  +    va_list vlist;
  +    char **aszArgs;
  +    const char *szArg;
  +    const char *const *aszEnv;
  +    char *szCmd;
  +    char *s;
  +    
  +    szCmd = _alloca(strlen(cmdname)+1);
  +    strcpy(szCmd, cmdname);
  +    for (s = szCmd; *s; ++s) {
  +        if (*s == '/') {
  +            *s = '\\';
  +	}
  +    }
  +
  +    va_start(vlist, cmdname);
  +    for (n = 0; va_arg(vlist, const char *); ++n)
  +        ;
  +    va_end(vlist);
  +
  +    aszArgs = _alloca((n + 1) * sizeof(const char *));
  +
  +    va_start(vlist, cmdname);
  +    for (n = 0; szArg = va_arg(vlist, const char *); ++n) {
  +        if (strchr(szArg, ' ')) {
  +            int l = strlen(szArg);
  +
  +            aszArgs[n] = _alloca(l + 2 + 1);
  +            aszArgs[n][0] = '"';
  +            strcpy(&aszArgs[n][1], szArg);
  +            aszArgs[n][l + 1] = '"';
  +            aszArgs[n][l + 2] = '\0';
  +        }
  +        else {
  +            aszArgs[n] = (char *)szArg;
  +        }
  +    }
  +
  +    aszArgs[n] = NULL;
  +
  +    aszEnv = va_arg(vlist, const char *const *);
  +    va_end(vlist);
  +    
  +    return _spawnve(mode, szCmd, aszArgs, aszEnv);
  +}
  +
  +#undef strftime
  +
  +/* Partial replacement for strftime. This adds certain expandos to the
  + * Windows version
  + */
  +
  +API_EXPORT(int) os_strftime(char *s, size_t max, const char *format,
  +                            const struct tm *tm) {
  +   /* If the new format string is bigger than max, the result string probably
  +    * won't fit anyway. When %-expandos are added, made sure the padding below
  +    * is enough.
  +    */
  +    char *new_format = (char *) _alloca(max + 11);
  +    size_t i, j, format_length = strlen(format);
  +    int return_value;
  +    int length_written;
  +
  +    for (i = 0, j = 0; (i < format_length && j < max);) {
  +        if (format[i] != '%') {
  +            new_format[j++] = format[i++];
  +            continue;
  +        }
  +        switch (format[i+1]) {
  +            case 'D':
  +                /* Is this locale dependent? Shouldn't be...
  +                   Also note the year 2000 exposure here */
  +                memcpy(new_format + j, "%m/%d/%y", 8);
  +                i += 2;
  +                j += 8;
  +                break;
  +            case 'r':
  +                memcpy(new_format + j, "%I:%M:%S %p", 11);
  +                i += 2;
  +                j += 11;
  +                break;
  +            case 'T':
  +                memcpy(new_format + j, "%H:%M:%S", 8);
  +                i += 2;
  +                j += 8;
  +                break;
  +            case 'e':
  +                length_written = _snprintf(new_format + j, max - j, "%2d",
  +                    tm->tm_mday);
  +                j = (length_written == -1) ? max : (j + length_written);
  +                i += 2;
  +                break;
  +            default:
  +                /* We know we can advance two characters forward here. */
  +                new_format[j++] = format[i++];
  +                new_format[j++] = format[i++];
  +        }
  +    }
  +    if (j >= max) {
  +        *s = '\0';  /* Defensive programming, okay since output is undefined */
  +        return_value = 0;
  +    } else {
  +        new_format[j] = '\0';
  +        return_value = strftime(s, max, new_format, tm);
  +    }
  +    return return_value;
  +}
  
  
  
  1.43      +0 -262    apache-1.3/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/util_win32.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- util_win32.c	2001/02/14 14:22:11	1.42
  +++ util_win32.c	2001/03/28 23:17:37	1.43
  @@ -58,7 +58,6 @@
   
   #ifdef WIN32
   
  -#include <windows.h>
   #include <sys/stat.h>
   #include <stdarg.h>
   #include <time.h>
  @@ -358,267 +357,6 @@
       return pNewName;
   }
   
  -/* Win95 doesn't like trailing /s. NT and Unix don't mind. This works 
  - * around the problem.
  - * Errr... except if it is UNC and we are referring to the root of 
  - * the UNC, we MUST have a trailing \ and we can't use /s. Jeez. 
  - * Not sure if this refers to all UNCs or just roots,
  - * but I'm going to fix it for all cases for now. (Ben)
  - */
  -
  -#undef stat
  -API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat)
  -{
  -    int n;
  -    int len = strlen(szPath);
  -    
  -    if ((len == 0) || (len >= MAX_PATH)) {
  -        return -1;
  -    }
  -
  -    if (szPath[0] == '/' && szPath[1] == '/') {
  -	char buf[_MAX_PATH];
  -	char *s;
  -	int nSlashes = 0;
  -
  -	strcpy(buf, szPath);
  -	for (s = buf; *s; ++s) {
  -	    if (*s == '/') {
  -		*s = '\\';
  -		++nSlashes;
  -	    }
  -	}
  -	/* then we need to add one more to get \\machine\share\ */
  -	if (nSlashes == 3) {
  -            if (++len >= MAX_PATH) {
  -                return -1;
  -            }
  -	    *s++ = '\\';
  -	}
  -	*s = '\0';
  -	return stat(buf, pStat);
  -    }
  -
  -    /*
  -     * Below removes the trailing /, however, do not remove
  -     * it in the case of 'x:/' or stat will fail
  -     */
  -    n = strlen(szPath);
  -    if ((szPath[n - 1] == '\\' || szPath[n - 1] == '/') &&
  -        !(n == 3 && szPath[1] == ':')) {
  -        char buf[_MAX_PATH];
  -        
  -        ap_assert(n < _MAX_PATH);
  -        strcpy(buf, szPath);
  -        buf[n - 1] = '\0';
  -        
  -        return stat(buf, pStat);
  -    }
  -    return stat(szPath, pStat);
  -}
  -
  -/* Fix two really crap problems with Win32 spawn[lv]e*:
  - *
  - *  1. Win32 doesn't deal with spaces in argv.
  - *  2. Win95 doesn't like / in cmdname.
  - */
  -
  -#undef _spawnv
  -API_EXPORT(int) os_spawnv(int mode, const char *cmdname,
  -			  const char *const *argv)
  -{
  -    int n;
  -    char **aszArgs;
  -    const char *szArg;
  -    char *szCmd;
  -    char *s;
  -    
  -    szCmd = _alloca(strlen(cmdname)+1);
  -    strcpy(szCmd, cmdname);
  -    for (s = szCmd; *s; ++s) {
  -        if (*s == '/') {
  -            *s = '\\';
  -	}
  -    }
  -
  -    for (n = 0; argv[n]; ++n)
  -        ;
  -
  -    aszArgs = _alloca((n + 1) * sizeof(const char *));
  -
  -    for (n = 0; szArg = argv[n]; ++n) {
  -        if (strchr(szArg, ' ')) {
  -            int l = strlen(szArg);
  -
  -            aszArgs[n] = _alloca(l + 2 + 1);
  -            aszArgs[n][0] = '"';
  -            strcpy(&aszArgs[n][1], szArg);
  -            aszArgs[n][l + 1] = '"';
  -            aszArgs[n][l + 2] = '\0';
  -        }
  -        else {
  -            aszArgs[n] = (char *)szArg;
  -        }
  -    }
  -
  -    aszArgs[n] = NULL;
  -
  -    return _spawnv(mode, szCmd, aszArgs);
  -}
  -
  -#undef _spawnve
  -API_EXPORT(int) os_spawnve(int mode, const char *cmdname,
  -			   const char *const *argv, const char *const *envp)
  -{
  -    int n;
  -    char **aszArgs;
  -    const char *szArg;
  -    char *szCmd;
  -    char *s;
  -    
  -    szCmd = _alloca(strlen(cmdname)+1);
  -    strcpy(szCmd, cmdname);
  -    for (s = szCmd; *s; ++s) {
  -        if (*s == '/') {
  -            *s = '\\';
  -	}
  -    }
  -    
  -    for (n = 0; argv[n]; ++n)
  -        ;
  -
  -    aszArgs = _alloca((n + 1)*sizeof(const char *));
  -
  -    for (n = 0; szArg = argv[n]; ++n){
  -        if (strchr(szArg, ' ')) {
  -            int l = strlen(szArg);
  -
  -            aszArgs[n] = _alloca(l + 2 + 1);
  -            aszArgs[n][0] = '"';
  -            strcpy(&aszArgs[n][1], szArg);
  -            aszArgs[n][l + 1] = '"';
  -            aszArgs[n][l + 2] = '\0';
  -        }
  -        else {
  -            aszArgs[n] = (char *)szArg;
  -        }
  -    }
  -
  -    aszArgs[n] = NULL;
  -
  -    return _spawnve(mode, szCmd, aszArgs, envp);
  -}
  -
  -API_EXPORT_NONSTD(int) os_spawnle(int mode, const char *cmdname, ...)
  -{
  -    int n;
  -    va_list vlist;
  -    char **aszArgs;
  -    const char *szArg;
  -    const char *const *aszEnv;
  -    char *szCmd;
  -    char *s;
  -    
  -    szCmd = _alloca(strlen(cmdname)+1);
  -    strcpy(szCmd, cmdname);
  -    for (s = szCmd; *s; ++s) {
  -        if (*s == '/') {
  -            *s = '\\';
  -	}
  -    }
  -
  -    va_start(vlist, cmdname);
  -    for (n = 0; va_arg(vlist, const char *); ++n)
  -        ;
  -    va_end(vlist);
  -
  -    aszArgs = _alloca((n + 1) * sizeof(const char *));
  -
  -    va_start(vlist, cmdname);
  -    for (n = 0; szArg = va_arg(vlist, const char *); ++n) {
  -        if (strchr(szArg, ' ')) {
  -            int l = strlen(szArg);
  -
  -            aszArgs[n] = _alloca(l + 2 + 1);
  -            aszArgs[n][0] = '"';
  -            strcpy(&aszArgs[n][1], szArg);
  -            aszArgs[n][l + 1] = '"';
  -            aszArgs[n][l + 2] = '\0';
  -        }
  -        else {
  -            aszArgs[n] = (char *)szArg;
  -        }
  -    }
  -
  -    aszArgs[n] = NULL;
  -
  -    aszEnv = va_arg(vlist, const char *const *);
  -    va_end(vlist);
  -    
  -    return _spawnve(mode, szCmd, aszArgs, aszEnv);
  -}
  -
  -#undef strftime
  -
  -/* Partial replacement for strftime. This adds certain expandos to the
  - * Windows version
  - */
  -
  -API_EXPORT(int) os_strftime(char *s, size_t max, const char *format,
  -                            const struct tm *tm) {
  -   /* If the new format string is bigger than max, the result string probably
  -    * won't fit anyway. When %-expandos are added, made sure the padding below
  -    * is enough.
  -    */
  -    char *new_format = (char *) _alloca(max + 11);
  -    size_t i, j, format_length = strlen(format);
  -    int return_value;
  -    int length_written;
  -
  -    for (i = 0, j = 0; (i < format_length && j < max);) {
  -        if (format[i] != '%') {
  -            new_format[j++] = format[i++];
  -            continue;
  -        }
  -        switch (format[i+1]) {
  -            case 'D':
  -                /* Is this locale dependent? Shouldn't be...
  -                   Also note the year 2000 exposure here */
  -                memcpy(new_format + j, "%m/%d/%y", 8);
  -                i += 2;
  -                j += 8;
  -                break;
  -            case 'r':
  -                memcpy(new_format + j, "%I:%M:%S %p", 11);
  -                i += 2;
  -                j += 11;
  -                break;
  -            case 'T':
  -                memcpy(new_format + j, "%H:%M:%S", 8);
  -                i += 2;
  -                j += 8;
  -                break;
  -            case 'e':
  -                length_written = ap_snprintf(new_format + j, max - j, "%2d",
  -                    tm->tm_mday);
  -                j = (length_written == -1) ? max : (j + length_written);
  -                i += 2;
  -                break;
  -            default:
  -                /* We know we can advance two characters forward here. */
  -                new_format[j++] = format[i++];
  -                new_format[j++] = format[i++];
  -        }
  -    }
  -    if (j >= max) {
  -        *s = '\0';  /* Defensive programming, okay since output is undefined */
  -        return_value = 0;
  -    } else {
  -        new_format[j] = '\0';
  -        return_value = strftime(s, max, new_format, tm);
  -    }
  -    return return_value;
  -}
   
   /*
    * ap_os_is_filename_valid is given a filename, and returns 0 if the filename
  
  
  
  1.10      +2 -2      apache-1.3/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- htdigest.mak	2000/12/21 07:24:35	1.9
  +++ htdigest.mak	2001/03/28 23:18:06	1.10
  @@ -180,6 +180,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -190,7 +191,6 @@
   	
   NODEP_CPP_AP_CP=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  @@ -220,13 +220,13 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
   NODEP_CPP_AP_MD=\
  -	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	
   
  
  
  
  1.18      +5 -5      apache-1.3/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- htpasswd.mak	2000/12/21 07:24:35	1.17
  +++ htpasswd.mak	2001/03/28 23:18:07	1.18
  @@ -195,12 +195,12 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
   NODEP_CPP_AP_BA=\
  -	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	
   
  @@ -233,6 +233,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -243,7 +244,6 @@
   	
   NODEP_CPP_AP_CP=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  @@ -273,13 +273,13 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
   NODEP_CPP_AP_MD=\
  -	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	
   
  @@ -292,13 +292,13 @@
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
   NODEP_CPP_AP_SH=\
  -	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	
   
  @@ -312,6 +312,7 @@
   	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  @@ -322,7 +323,6 @@
   	
   NODEP_CPP_AP_SN=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\sfio.h"\
   	
   
  
  
  
  1.6       +15 -3     apache-1.3/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rotatelogs.dsp	2000/12/19 23:22:12	1.5
  +++ rotatelogs.dsp	2001/03/28 23:18:08	1.6
  @@ -49,8 +49,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 /nologo /subsystem:console /incremental:no /map /machine:I386
  -# ADD LINK32 /nologo /subsystem:console /incremental:no /map /machine:I386
  +# ADD BASE LINK32 /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
   
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386
  -# ADD LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  @@ -82,6 +82,18 @@
   
   # Name "rotatelogs - Win32 Release"
   # Name "rotatelogs - Win32 Debug"
  +# Begin Source File
  +
  +SOURCE=..\ap\ap_cpystrn.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\ap\ap_snprintf.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\os\win32\os.c
  +# End Source File
   # Begin Source File
   
   SOURCE=.\rotatelogs.c
  
  
  
  1.8       +75 -6     apache-1.3/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- rotatelogs.mak	2000/12/21 07:24:36	1.7
  +++ rotatelogs.mak	2001/03/28 23:18:12	1.8
  @@ -50,6 +50,9 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap_cpystrn.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\os.obj"
   	-@erase "$(INTDIR)\rotatelogs.idb"
   	-@erase "$(INTDIR)\rotatelogs.obj"
   	-@erase "$(OUTDIR)\rotatelogs.exe"
  @@ -68,10 +71,13 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
  - /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /machine:I386\
  - /out:"$(OUTDIR)\rotatelogs.exe" 
  +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\
  + /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\
  + /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
   LINK32_OBJS= \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_snprintf.obj" \
  +	"$(INTDIR)\os.obj" \
   	"$(INTDIR)\rotatelogs.obj"
   
   "$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -98,6 +104,9 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap_cpystrn.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\os.obj"
   	-@erase "$(INTDIR)\rotatelogs.idb"
   	-@erase "$(INTDIR)\rotatelogs.obj"
   	-@erase "$(OUTDIR)\rotatelogs.exe"
  @@ -117,10 +126,13 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
  - /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /debug\
  - /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
  +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\
  + /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
   LINK32_OBJS= \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_snprintf.obj" \
  +	"$(INTDIR)\os.obj" \
   	"$(INTDIR)\rotatelogs.obj"
   
   "$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -163,6 +175,63 @@
   
   !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
    "rotatelogs - Win32 Debug"
  +SOURCE=..\ap\ap_cpystrn.c
  +DEP_CPP_AP_CP=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_CP=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +SOURCE=..\ap\ap_snprintf.c
  +DEP_CPP_AP_SN=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_ebcdic.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_SN=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +SOURCE=..\os\win32\os.c
  +DEP_CPP_OS_C4=\
  +	"..\os\win32\os.h"\
  +	
  +
  +"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C4) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=.\rotatelogs.c
   DEP_CPP_ROTAT=\
   	"..\include\ap_config.h"\
  
  
  

Mime
View raw message