You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2009/09/25 03:06:54 UTC
svn commit: r818685 - in /httpd/httpd/branches/2.2.x/modules/proxy:
NWGNUproxy NWGNUproxyajp NWGNUproxybalancer NWGNUproxycon NWGNUproxyftp
NWGNUproxyhtp
Author: fuankg
Date: Fri Sep 25 01:06:54 2009
New Revision: 818685
URL: http://svn.apache.org/viewvc?rev=818685&view=rev
Log:
changed build of proxy modules to use common mod_proxy.imp file (backport r815392).
Modified:
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy Fri Sep 25 01:06:54 2009
@@ -223,16 +223,7 @@
# Any symbols exported to here
#
FILES_nlm_exports = \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
- proxy_hook_pre_request \
- proxy_hook_post_request \
- ap_proxy_ssl_enable \
- ap_proxy_ssl_disable \
- ap_proxy_conn_is_https \
- ap_proxy_ssl_val \
- proxy_run_fixups \
+ @$(OBJDIR)/mod_proxy.imp \
$(EOLIST)
#
@@ -248,7 +239,7 @@
libs :: $(OBJDIR) $(TARGET_lib)
-nlms :: libs $(TARGET_nlm)
+nlms :: libs $(OBJDIR)/mod_proxy.imp $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
@@ -262,6 +253,20 @@
vpath %.c ../arch/netware
+$(OBJDIR)/mod_proxy.imp:
+ @echo Creating $@
+ @echo # Exports of mod_proxy > $@
+ @echo proxy_module, >> $@
+ @echo proxy_hook_canon_handler, >> $@
+ @echo proxy_hook_post_request, >> $@
+ @echo proxy_hook_pre_request, >> $@
+ @echo proxy_hook_scheme_handler, >> $@
+ @echo proxy_run_fixups, >> $@
+ @echo ap_proxy_conn_is_https, >> $@
+ @echo ap_proxy_ssl_enable, >> $@
+ @echo ap_proxy_ssl_disable, >> $@
+ @echo ap_proxy_ssl_val >> $@
+
#
# Include the 'tail' makefile that has targets that depend on variables defined
# in this makefile
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp Fri Sep 25 01:06:54 2009
@@ -213,15 +213,8 @@
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
+ @$(OBJDIR)/mod_proxy.imp \
@libc.imp \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
- proxy_run_fixups \
- ap_proxy_ssl_enable \
- ap_proxy_ssl_disable \
- ap_proxy_conn_is_https \
- ap_proxy_ssl_val \
$(EOLIST)
# Don't link with Winsock if standard sockets are being used
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer Fri Sep 25 01:06:54 2009
@@ -209,16 +209,8 @@
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
+ @$(OBJDIR)/mod_proxy.imp \
@libc.imp \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
- proxy_hook_pre_request \
- proxy_hook_post_request \
- proxy_hook_load_lbmethods \
- proxy_run_fixups \
- ap_proxy_ssl_enable \
- ap_proxy_ssl_disable \
$(EOLIST)
# Don't link with Winsock if standard sockets are being used
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon Fri Sep 25 01:06:54 2009
@@ -208,10 +208,8 @@
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
+ @$(OBJDIR)/mod_proxy.imp \
@libc.imp \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp Fri Sep 25 01:06:54 2009
@@ -209,12 +209,8 @@
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
+ @$(OBJDIR)/mod_proxy.imp \
@libc.imp \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
- ap_proxy_ssl_enable \
- ap_proxy_ssl_disable \
$(EOLIST)
# Don't link with Winsock if standard sockets are being used
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp?rev=818685&r1=818684&r2=818685&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp Fri Sep 25 01:06:54 2009
@@ -209,13 +209,8 @@
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
+ @$(OBJDIR)/mod_proxy.imp \
@libc.imp \
- proxy_module \
- proxy_hook_scheme_handler \
- proxy_hook_canon_handler \
- proxy_run_fixups \
- ap_proxy_ssl_enable \
- ap_proxy_ssl_disable \
$(EOLIST)
# Don't link with Winsock if standard sockets are being used