httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1728574 - in /httpd/httpd/trunk: build/ modules/proxy/
Date Fri, 05 Feb 2016 00:20:07 GMT
Author: rjung
Date: Fri Feb  5 00:20:07 2016
New Revision: 1728574

URL: http://svn.apache.org/viewvc?rev=1728574&view=rev
Log:
Build symbol import and export files for
proxy on Netware using the same awk script
which is already used for mod_cache.

Adjust other Netware makefiles to use this
new imp file.

Modified:
    httpd/httpd/trunk/build/NWGNUmakefile
    httpd/httpd/trunk/modules/proxy/NWGNUproxy
    httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
    httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
    httpd/httpd/trunk/modules/proxy/NWGNUproxycon
    httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
    httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
    httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
    httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf
    httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
    httpd/httpd/trunk/modules/proxy/NWGNUproxywstunnel

Modified: httpd/httpd/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Fri Feb  5 00:20:07 2016
@@ -23,7 +23,7 @@ FILES_prebuild_headers = \
 	$(PCRE)/pcre.h \
 	$(EOLIST) 
     
-nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp
+nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp $(STDMOD)/proxy/mod_proxy.imp
 
 libs :: chkapr $(NWOS)/chartables.c
 
@@ -35,6 +35,10 @@ $(STDMOD)/cache/mod_cache.imp: make_nw_e
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
 
+$(STDMOD)/proxy/mod_proxy.imp: make_nw_export.awk $(STDMOD)/proxy/mod_proxy.h $(STDMOD)/proxy/proxy_util.h
+	@echo $(DL)GEN  $@$(DL)
+	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
+
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
@@ -119,6 +123,7 @@ clean ::
 	$(call DEL,$(PCRE)/config.h)
 	$(call DEL,$(PCRE)/pcre.h)
 	$(call DEL,$(STDMOD)/cache/mod_cache.imp)
+	$(call DEL,$(STDMOD)/proxy/mod_proxy.imp)
 	$(call DEL,$(DAV)/main/dav.imp)
 	$(call DEL,$(NWOS)/httpd.imp)
 	$(call DEL,nw_export.i)

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Fri Feb  5 00:20:07 2016
@@ -221,7 +221,8 @@ endif
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
+	proxy_module \
 	$(EOLIST)
 
 #
@@ -237,7 +238,7 @@ FILES_lib_objs = \
 
 libs :: $(OBJDIR) $(TARGET_lib)
 
-nlms :: libs $(OBJDIR)/mod_proxy.imp $(TARGET_nlm)
+nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
@@ -251,94 +252,6 @@ install :: nlms FORCE
 
 vpath %.c ../arch/netware
 
-$(OBJDIR)/mod_proxy.imp: NWGNUproxy
-	@echo $(DL)GEN  $@$(DL)
-	@echo $(DL)# Exports of mod_proxy$(DL)> $@
-	@echo $(DL) (AP$(VERSION_MAJMIN))$(DL)>> $@
-	@echo $(DL) proxy_module,$(DL)>> $@
-	@echo $(DL) proxy_hcmethods,$(DL)>> $@
-	@echo $(DL) proxy_hook_canon_handler,$(DL)>> $@
-	@echo $(DL) proxy_hook_create_req,$(DL)>> $@
-	@echo $(DL) proxy_hook_detach_backend,$(DL)>> $@
-	@echo $(DL) proxy_hook_fixups,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_canon_handler,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_create_req,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_detach_backend,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_fixups,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_post_request,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_pre_request,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_request_status,$(DL)>> $@
-	@echo $(DL) proxy_hook_get_scheme_handler,$(DL)>> $@
-	@echo $(DL) proxy_hook_post_request,$(DL)>> $@
-	@echo $(DL) proxy_hook_pre_request,$(DL)>> $@
-	@echo $(DL) proxy_hook_request_status,$(DL)>> $@
-	@echo $(DL) proxy_hook_scheme_handler,$(DL)>> $@
-	@echo $(DL) proxy_run_canon_handler,$(DL)>> $@
-	@echo $(DL) proxy_run_create_req,$(DL)>> $@
-	@echo $(DL) proxy_run_detach_backend,$(DL)>> $@
-	@echo $(DL) proxy_run_fixups,$(DL)>> $@
-	@echo $(DL) proxy_run_post_request,$(DL)>> $@
-	@echo $(DL) proxy_run_pre_request,$(DL)>> $@
-	@echo $(DL) proxy_run_request_status,$(DL)>> $@
-	@echo $(DL) proxy_run_scheme_handler,$(DL)>> $@
-	@echo $(DL) ap_proxy_acquire_connection,$(DL)>> $@
-	@echo $(DL) ap_proxy_backend_broke,$(DL)>> $@
-	@echo $(DL) ap_proxy_buckets_lifetime_transform,$(DL)>> $@
-	@echo $(DL) ap_proxy_c2hex,$(DL)>> $@
-	@echo $(DL) ap_proxy_canon_netloc,$(DL)>> $@
-	@echo $(DL) ap_proxy_canonenc,$(DL)>> $@
-	@echo $(DL) ap_proxy_checkproxyblock,$(DL)>> $@
-	@echo $(DL) ap_proxy_conn_is_https,$(DL)>> $@
-	@echo $(DL) ap_proxy_connect_backend,$(DL)>> $@
-	@echo $(DL) ap_proxy_connect_to_backend,$(DL)>> $@
-	@echo $(DL) ap_proxy_connect_uds,$(DL)>> $@
-	@echo $(DL) ap_proxy_connection_create,$(DL)>> $@
-	@echo $(DL) ap_proxy_connection_reusable,$(DL)>> $@
-	@echo $(DL) ap_proxy_cookie_reverse_map,$(DL)>> $@
-	@echo $(DL) ap_proxy_create_hdrbrgd,$(DL)>> $@
-	@echo $(DL) ap_proxy_de_socketfy,$(DL)>> $@
-	@echo $(DL) ap_proxy_define_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_define_match_worker,$(DL)>> $@
-	@echo $(DL) ap_proxy_define_worker,$(DL)>> $@
-	@echo $(DL) ap_proxy_determine_connection,$(DL)>> $@
-	@echo $(DL) ap_proxy_find_balancershm,$(DL)>> $@
-	@echo $(DL) ap_proxy_find_workershm,$(DL)>> $@
-	@echo $(DL) ap_proxy_get_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_get_worker,$(DL)>> $@
-	@echo $(DL) ap_proxy_hashfunc,$(DL)>> $@
-	@echo $(DL) ap_proxy_hex2c,$(DL)>> $@
-	@echo $(DL) ap_proxy_initialize_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_initialize_worker,$(DL)>> $@
-	@echo $(DL) ap_proxy_is_domainname,$(DL)>> $@
-	@echo $(DL) ap_proxy_is_hostname,$(DL)>> $@
-	@echo $(DL) ap_proxy_is_ipaddr,$(DL)>> $@
-	@echo $(DL) ap_proxy_is_socket_connected,$(DL)>> $@
-	@echo $(DL) ap_proxy_is_word,$(DL)>> $@
-	@echo $(DL) ap_proxy_location_reverse_map,$(DL)>> $@
-	@echo $(DL) ap_proxy_parse_wstatus,$(DL)>> $@
-	@echo $(DL) ap_proxy_pass_brigade,$(DL)>> $@
-	@echo $(DL) ap_proxy_port_of_scheme,$(DL)>> $@
-	@echo $(DL) ap_proxy_post_request,$(DL)>> $@
-	@echo $(DL) ap_proxy_pre_http_request,$(DL)>> $@
-	@echo $(DL) ap_proxy_pre_request,$(DL)>> $@
-	@echo $(DL) ap_proxy_release_connection,$(DL)>> $@
-	@echo $(DL) ap_proxy_set_wstatus,$(DL)>> $@
-	@echo $(DL) ap_proxy_share_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_share_worker,$(DL)>> $@
-	@echo $(DL) ap_proxy_show_hcmethod,$(DL)>> $@
-	@echo $(DL) ap_proxy_ssl_connection_cleanup,$(DL)>> $@
-	@echo $(DL) ap_proxy_ssl_disable,$(DL)>> $@
-	@echo $(DL) ap_proxy_ssl_enable,$(DL)>> $@
-	@echo $(DL) ap_proxy_ssl_val,$(DL)>> $@
-	@echo $(DL) ap_proxy_strncpy,$(DL)>> $@
-	@echo $(DL) ap_proxy_sync_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_trans_match,$(DL)>> $@
-	@echo $(DL) ap_proxy_transfer_between_connections,$(DL)>> $@
-	@echo $(DL) ap_proxy_update_balancer,$(DL)>> $@
-	@echo $(DL) ap_proxy_valid_balancer_name,$(DL)>> $@
-	@echo $(DL) ap_proxy_worker_name,$(DL)>> $@
-	@echo $(DL) ap_proxyerror$(DL)>> $@
-
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
 # in this makefile

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Fri Feb  5 00:20:07 2016
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
  

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Fri Feb  5 00:20:07 2016
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxycon
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxycon?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxycon Fri Feb  5 00:20:07 2016
@@ -205,7 +205,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress Fri Feb  5 00:20:07 2016
@@ -203,7 +203,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 # Don't link with Winsock if standard sockets are being used

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi Fri Feb  5 00:20:07 2016
@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Fri Feb  5 00:20:07 2016
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Fri Feb  5 00:20:07 2016
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy Fri Feb  5 00:20:07 2016
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb Fri Feb  5 00:20:07 2016
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req Fri Feb  5 00:20:07 2016
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf Fri Feb  5 00:20:07 2016
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi Fri Feb  5 00:20:07 2016
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)
  

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxywstunnel
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxywstunnel?rev=1728574&r1=1728573&r2=1728574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxywstunnel (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxywstunnel Fri Feb  5 00:20:07 2016
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@aprlib.imp \
 	@httpd.imp \
-	@$(OBJDIR)/mod_proxy.imp \
+	@mod_proxy.imp \
 	$(EOLIST)
 
 #



Mime
View raw message