summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2016-02-05 01:20:07 +0100
committerRainer Jung <rjung@apache.org>2016-02-05 01:20:07 +0100
commit617e068f505ea6809bc473c411bf63cd1e5d2894 (patch)
tree071977531636c0bbcbdd5ccc90fc6143562defb3
parentAdd support for the proxy modules to (diff)
downloadapache2-617e068f505ea6809bc473c411bf63cd1e5d2894.tar.xz
apache2-617e068f505ea6809bc473c411bf63cd1e5d2894.zip
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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728574 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--build/NWGNUmakefile7
-rw-r--r--modules/proxy/NWGNUproxy93
-rw-r--r--modules/proxy/NWGNUproxyajp2
-rw-r--r--modules/proxy/NWGNUproxybalancer2
-rw-r--r--modules/proxy/NWGNUproxycon2
-rw-r--r--modules/proxy/NWGNUproxyexpress2
-rw-r--r--modules/proxy/NWGNUproxyfcgi2
-rw-r--r--modules/proxy/NWGNUproxyftp2
-rw-r--r--modules/proxy/NWGNUproxyhtp2
-rw-r--r--modules/proxy/NWGNUproxylbm_busy2
-rw-r--r--modules/proxy/NWGNUproxylbm_hb2
-rw-r--r--modules/proxy/NWGNUproxylbm_req2
-rw-r--r--modules/proxy/NWGNUproxylbm_traf2
-rw-r--r--modules/proxy/NWGNUproxyscgi2
-rw-r--r--modules/proxy/NWGNUproxywstunnel2
15 files changed, 22 insertions, 104 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 1954257eb5..8bc935abd9 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -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_export.awk $(STDMOD)/cache/mod_cache.h $(
@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)
diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index e91b37cc20..5238b23772 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -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
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 9fc0ef2212..fb46490681 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 277dcbd490..93cd196533 100644
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 614293181a..522096870e 100644
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -205,7 +205,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 1c34133a8b..f2dbc59934 100644
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -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
diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a3ecf4cb85..f8c2618af7 100644
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -207,7 +207,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 27fee00a69..2da1217cba 100644
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 5c4f8932b3..e385f35395 100644
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index fff1db7561..c0888ee92e 100644
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
@libc.imp \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
$(EOLIST)
#
diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 35a7348a2c..172f2a997c 100644
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
@libc.imp \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
$(EOLIST)
#
diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 5d41f78a1a..0f14c934cc 100644
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
@libc.imp \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
$(EOLIST)
#
diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 61b14c0960..e328bda0e5 100644
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
@libc.imp \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
$(EOLIST)
#
diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 2445fd3f20..7eeaaaae64 100644
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
@libc.imp \
$(EOLIST)
diff --git a/modules/proxy/NWGNUproxywstunnel b/modules/proxy/NWGNUproxywstunnel
index ce84ce4566..235f29470d 100644
--- a/modules/proxy/NWGNUproxywstunnel
+++ b/modules/proxy/NWGNUproxywstunnel
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
@libc.imp \
@aprlib.imp \
@httpd.imp \
- @$(OBJDIR)/mod_proxy.imp \
+ @mod_proxy.imp \
$(EOLIST)
#
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 09:51:46 +0100