ben 97/08/17 06:56:29
Modified: src/modules/proxy ApacheModuleProxy.mak mod_proxy.h
proxy_cache.c proxy_connect.c proxy_ftp.c
Log:
Move DEF_Explain to source files. Fix header dependency.
PR: 902
Revision Changes Path
1.3 +95 -6 apachen/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheModuleProxy.mak 1997/08/13 08:37:21 1.2
+++ ApacheModuleProxy.mak 1997/08/17 13:56:26 1.3
@@ -221,8 +221,21 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_MOD_P=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\mod_proxy.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
!ENDIF
@@ -254,8 +267,25 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_PROXY=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\multithread.h"\
+ "..\..\core\util_date.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\proxy_cache.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
!ENDIF
@@ -284,8 +314,22 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_PROXY_=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\proxy_connect.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
!ENDIF
@@ -314,8 +358,22 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_PROXY_F=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ "..\standard\mod_mime.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
!ENDIF
@@ -345,8 +403,23 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_PROXY_H=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_date.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\proxy_http.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
!ENDIF
@@ -377,8 +450,24 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+DEP_CPP_PROXY_U=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\multithread.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ ".\mod_proxy.h"\
+
-"$(INTDIR)\proxy_util.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
!ENDIF
1.18 +0 -3 apachen/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_proxy.h 1997/08/15 17:59:51 1.17
+++ mod_proxy.h 1997/08/17 13:56:26 1.18
@@ -103,9 +103,6 @@
#include "explain.h"
-DEF_Explain
-
-
extern module MODULE_VAR_EXPORT proxy_module;
1.23 +2 -0 apachen/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- proxy_cache.c 1997/08/15 17:59:52 1.22
+++ proxy_cache.c 1997/08/17 13:56:27 1.23
@@ -64,6 +64,8 @@
#include "multithread.h"
#include "md5.h"
+DEF_Explain
+
#define abs(c) ((c) >= 0 ? (c) : -(c))
struct gc_ent
1.13 +2 -0 apachen/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- proxy_connect.c 1997/08/02 00:58:33 1.12
+++ proxy_connect.c 1997/08/17 13:56:27 1.13
@@ -60,6 +60,8 @@
#include <bstring.h> /* for IRIX, FD_SET calls bzero() */
#endif
+DEF_Explain
+
/*
* This handles Netscape CONNECT method secure proxy requests.
* A connection is opened to the specified host and data is
1.35 +2 -0 apachen/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- proxy_ftp.c 1997/08/16 14:38:25 1.34
+++ proxy_ftp.c 1997/08/17 13:56:27 1.35
@@ -56,6 +56,8 @@
#include "http_main.h"
#include "../standard/mod_mime.h"
+DEF_Explain
+
/*
* Decodes a '%' escaped string, and returns the number of characters
*/
