httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.org>
Subject cvs commit: apache/src/nt modules.c
Date Sat, 12 Jul 1997 13:14:48 GMT
ben         97/07/12 06:14:47

  Modified:    src       apache.mak mod_autoindex.c
               src/nt    modules.c
  Log:
  Add autoindex module to Win32.
  
  Revision  Changes    Path
  1.5       +169 -5    apache/src/apache.mak
  
  Index: apache.mak
  ===================================================================
  RCS file: /export/home/cvs/apache/src/apache.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** apache.mak	1997/07/12 12:33:12	1.4
  --- apache.mak	1997/07/12 13:14:44	1.5
  ***************
  *** 72,77 ****
  --- 72,78 ----
    	-@erase "$(INTDIR)\mod_alias.obj"
    	-@erase "$(INTDIR)\mod_asis.obj"
    	-@erase "$(INTDIR)\mod_auth.obj"
  + 	-@erase "$(INTDIR)\mod_autoindex.obj"
    	-@erase "$(INTDIR)\mod_browser.obj"
    	-@erase "$(INTDIR)\mod_cgi.obj"
    	-@erase "$(INTDIR)\mod_dir.obj"
  ***************
  *** 138,143 ****
  --- 139,145 ----
    	"$(INTDIR)\mod_alias.obj" \
    	"$(INTDIR)\mod_asis.obj" \
    	"$(INTDIR)\mod_auth.obj" \
  + 	"$(INTDIR)\mod_autoindex.obj" \
    	"$(INTDIR)\mod_browser.obj" \
    	"$(INTDIR)\mod_cgi.obj" \
    	"$(INTDIR)\mod_dir.obj" \
  ***************
  *** 217,222 ****
  --- 219,226 ----
    	-@erase "$(INTDIR)\mod_asis.sbr"
    	-@erase "$(INTDIR)\mod_auth.obj"
    	-@erase "$(INTDIR)\mod_auth.sbr"
  + 	-@erase "$(INTDIR)\mod_autoindex.obj"
  + 	-@erase "$(INTDIR)\mod_autoindex.sbr"
    	-@erase "$(INTDIR)\mod_browser.obj"
    	-@erase "$(INTDIR)\mod_browser.sbr"
    	-@erase "$(INTDIR)\mod_cgi.obj"
  ***************
  *** 300,305 ****
  --- 304,310 ----
    	"$(INTDIR)\mod_alias.sbr" \
    	"$(INTDIR)\mod_asis.sbr" \
    	"$(INTDIR)\mod_auth.sbr" \
  + 	"$(INTDIR)\mod_autoindex.sbr" \
    	"$(INTDIR)\mod_browser.sbr" \
    	"$(INTDIR)\mod_cgi.sbr" \
    	"$(INTDIR)\mod_dir.sbr" \
  ***************
  *** 353,358 ****
  --- 358,364 ----
    	"$(INTDIR)\mod_alias.obj" \
    	"$(INTDIR)\mod_asis.obj" \
    	"$(INTDIR)\mod_auth.obj" \
  + 	"$(INTDIR)\mod_autoindex.obj" \
    	"$(INTDIR)\mod_browser.obj" \
    	"$(INTDIR)\mod_cgi.obj" \
    	"$(INTDIR)\mod_dir.obj" \
  ***************
  *** 432,437 ****
  --- 438,445 ----
    	-@erase "$(INTDIR)\mod_asis.sbr"
    	-@erase "$(INTDIR)\mod_auth.obj"
    	-@erase "$(INTDIR)\mod_auth.sbr"
  + 	-@erase "$(INTDIR)\mod_autoindex.obj"
  + 	-@erase "$(INTDIR)\mod_autoindex.sbr"
    	-@erase "$(INTDIR)\mod_browser.obj"
    	-@erase "$(INTDIR)\mod_browser.sbr"
    	-@erase "$(INTDIR)\mod_cgi.obj"
  ***************
  *** 515,520 ****
  --- 523,529 ----
    	"$(INTDIR)\mod_alias.sbr" \
    	"$(INTDIR)\mod_asis.sbr" \
    	"$(INTDIR)\mod_auth.sbr" \
  + 	"$(INTDIR)\mod_autoindex.sbr" \
    	"$(INTDIR)\mod_browser.sbr" \
    	"$(INTDIR)\mod_cgi.sbr" \
    	"$(INTDIR)\mod_dir.sbr" \
  ***************
  *** 568,573 ****
  --- 577,583 ----
    	"$(INTDIR)\mod_alias.obj" \
    	"$(INTDIR)\mod_asis.obj" \
    	"$(INTDIR)\mod_auth.obj" \
  + 	"$(INTDIR)\mod_autoindex.obj" \
    	"$(INTDIR)\mod_browser.obj" \
    	"$(INTDIR)\mod_cgi.obj" \
    	"$(INTDIR)\mod_dir.obj" \
  ***************
  *** 647,652 ****
  --- 657,664 ----
    	-@erase "$(INTDIR)\mod_asis.sbr"
    	-@erase "$(INTDIR)\mod_auth.obj"
    	-@erase "$(INTDIR)\mod_auth.sbr"
  + 	-@erase "$(INTDIR)\mod_autoindex.obj"
  + 	-@erase "$(INTDIR)\mod_autoindex.sbr"
    	-@erase "$(INTDIR)\mod_browser.obj"
    	-@erase "$(INTDIR)\mod_browser.sbr"
    	-@erase "$(INTDIR)\mod_cgi.obj"
  ***************
  *** 728,733 ****
  --- 740,746 ----
    	"$(INTDIR)\mod_alias.sbr" \
    	"$(INTDIR)\mod_asis.sbr" \
    	"$(INTDIR)\mod_auth.sbr" \
  + 	"$(INTDIR)\mod_autoindex.sbr" \
    	"$(INTDIR)\mod_browser.sbr" \
    	"$(INTDIR)\mod_cgi.sbr" \
    	"$(INTDIR)\mod_dir.sbr" \
  ***************
  *** 781,786 ****
  --- 794,800 ----
    	"$(INTDIR)\mod_alias.obj" \
    	"$(INTDIR)\mod_asis.obj" \
    	"$(INTDIR)\mod_auth.obj" \
  + 	"$(INTDIR)\mod_autoindex.obj" \
    	"$(INTDIR)\mod_browser.obj" \
    	"$(INTDIR)\mod_cgi.obj" \
    	"$(INTDIR)\mod_dir.obj" \
  ***************
  *** 2618,2647 ****
    # Begin Source File
    
    SOURCE=.\NT\modules.c
    DEP_CPP_MODUL=\
  - 	".\./regex\regex.h"\
    	".\alloc.h"\
    	".\buff.h"\
    	".\conf.h"\
    	".\http_config.h"\
    	".\httpd.h"\
    	".\nt\readdir.h"\
  - 	{$(INCLUDE)}"\sys\STAT.H"\
    	{$(INCLUDE)}"\sys\TYPES.H"\
    	
    NODEP_CPP_MODUL=\
    	".\sfio.h"\
    	
    
  - !IF  "$(CFG)" == "apache - Win32 Release"
  - 
  - 
    "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
       $(CPP) $(CPP_PROJ) $(SOURCE)
    
    
    !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
    
    
    BuildCmds= \
    	$(CPP) $(CPP_PROJ) $(SOURCE) \
  --- 2632,2670 ----
    # Begin Source File
    
    SOURCE=.\NT\modules.c
  + 
  + !IF  "$(CFG)" == "apache - Win32 Release"
  + 
    DEP_CPP_MODUL=\
    	".\alloc.h"\
    	".\buff.h"\
    	".\conf.h"\
    	".\http_config.h"\
    	".\httpd.h"\
    	".\nt\readdir.h"\
    	{$(INCLUDE)}"\sys\TYPES.H"\
    	
    NODEP_CPP_MODUL=\
    	".\sfio.h"\
    	
    
    "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
       $(CPP) $(CPP_PROJ) $(SOURCE)
    
    
    !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
    
  + DEP_CPP_MODUL=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
    
    BuildCmds= \
    	$(CPP) $(CPP_PROJ) $(SOURCE) \
  ***************
  *** 2655,2660 ****
  --- 2678,2694 ----
    
    !ELSEIF  "$(CFG)" == "apache - Win32 Pre"
    
  + DEP_CPP_MODUL=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
    
    BuildCmds= \
    	$(CPP) $(CPP_PROJ) $(SOURCE) \
  ***************
  *** 2668,2673 ****
  --- 2702,2721 ----
    
    !ELSEIF  "$(CFG)" == "apache - Win32 Profile"
    
  + DEP_CPP_MODUL=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
  + NODEP_CPP_MODUL=\
  + 	".\sfio.h"\
  + 	
    
    BuildCmds= \
    	$(CPP) $(CPP_PROJ) $(SOURCE) \
  ***************
  *** 2971,2976 ****
  --- 3019,3140 ----
    
    "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
       $(BuildCmds)
  + 
  + !ENDIF 
  + 
  + # End Source File
  + ################################################################################
  + # Begin Source File
  + 
  + SOURCE=.\mod_autoindex.c
  + 
  + !IF  "$(CFG)" == "apache - Win32 Release"
  + 
  + DEP_CPP_MOD_AUT=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\http_core.h"\
  + 	".\http_log.h"\
  + 	".\http_main.h"\
  + 	".\http_protocol.h"\
  + 	".\http_request.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	".\util_script.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
  + NODEP_CPP_MOD_AUT=\
  + 	".\sfio.h"\
  + 	
  + 
  + "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + 
  + !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
  + 
  + DEP_CPP_MOD_AUT=\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\http_core.h"\
  + 	".\http_log.h"\
  + 	".\http_main.h"\
  + 	".\http_protocol.h"\
  + 	".\http_request.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	".\util_script.h"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
  + NODEP_CPP_MOD_AUT=\
  + 	".\sfio.h"\
  + 	
  + 
  + "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + 
  + !ELSEIF  "$(CFG)" == "apache - Win32 Pre"
  + 
  + DEP_CPP_MOD_AUT=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\http_core.h"\
  + 	".\http_log.h"\
  + 	".\http_main.h"\
  + 	".\http_protocol.h"\
  + 	".\http_request.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	".\util_script.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
  + NODEP_CPP_MOD_AUT=\
  + 	".\sfio.h"\
  + 	
  + 
  + "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + 
  + !ELSEIF  "$(CFG)" == "apache - Win32 Profile"
  + 
  + DEP_CPP_MOD_AUT=\
  + 	".\./regex\regex.h"\
  + 	".\alloc.h"\
  + 	".\buff.h"\
  + 	".\conf.h"\
  + 	".\http_config.h"\
  + 	".\http_core.h"\
  + 	".\http_log.h"\
  + 	".\http_main.h"\
  + 	".\http_protocol.h"\
  + 	".\http_request.h"\
  + 	".\httpd.h"\
  + 	".\nt\readdir.h"\
  + 	".\util_script.h"\
  + 	{$(INCLUDE)}"\sys\STAT.H"\
  + 	{$(INCLUDE)}"\sys\TYPES.H"\
  + 	
  + NODEP_CPP_MOD_AUT=\
  + 	".\sfio.h"\
  + 	
  + 
  + "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
  + "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  + 
    
    !ENDIF 
    
  
  
  
  1.35      +0 -4      apache/src/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_autoindex.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -C3 -r1.34 -r1.35
  *** mod_autoindex.c	1997/07/08 19:53:15	1.34
  --- mod_autoindex.c	1997/07/12 13:14:45	1.35
  ***************
  *** 68,77 ****
    #include "http_main.h"
    #include "util_script.h"
    
  - #ifdef WIN32
  - #include "nt/readdir.h"
  - #endif
  - 
    module autoindex_module;
    
    /****************************************************************
  --- 68,73 ----
  
  
  
  1.2       +3 -0      apache/src/nt/modules.c
  
  Index: modules.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/nt/modules.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** modules.c	1997/06/15 19:22:52	1.1
  --- modules.c	1997/07/12 13:14:47	1.2
  ***************
  *** 22,27 ****
  --- 22,28 ----
    extern module action_module;
    extern module browser_module;
    extern module proxy_module;
  + extern module autoindex_module;
    
    module *prelinked_modules[] = {
      &core_module,
  ***************
  *** 41,46 ****
  --- 42,48 ----
      &action_module,
      &browser_module,
      &proxy_module,
  +   &autoindex_module,
      NULL
    };
    module *preloaded_modules[] = {
  ***************
  *** 61,65 ****
  --- 63,68 ----
      &action_module,
      &browser_module,
      &proxy_module,
  +   &autoindex_module,
      NULL
    };
  
  
  

Mime
View raw message