svn commit: r1728780 - in /httpd/httpd/trunk: build/make_nw_export.awk modules/proxy/NWGNUproxy

[rj...@apache.org]

Author: rjung
Date: Sat Feb  6 00:35:22 2016
New Revision: 1728780

URL: http://svn.apache.org/viewvc?rev=1728780&view=rev
Log:
Add proxy_module to the list of symbols
detected by Netware export/import awk
script.

We do not export proxy_module by putting it
into modules/proxy/NWGNUproxy explicitely,
because all accompanying proxy modules need
this symbol to access their config. So let
the awk script add proxy_module to the imp
file and then export it from mod_proxy and
import it to all other mod_proxy_xxx modules
via the imp file.

Modified:
    httpd/httpd/trunk/build/make_nw_export.awk
    httpd/httpd/trunk/modules/proxy/NWGNUproxy

Modified: httpd/httpd/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/make_nw_export.awk?rev=1728780&r1=1728779&r2=1728780&view=diff
==============================================================================
--- httpd/httpd/trunk/build/make_nw_export.awk (original)
+++ httpd/httpd/trunk/build/make_nw_export.awk Sat Feb  6 00:35:22 2016
@@ -98,13 +98,12 @@ function add_symbol(sym_name) {
     add_symbol($NF)
 }
 
-/^[ \t]*PROXY_DECLARE_DATA (extern[ \t]+)?.*;/ {
+/^[ \t]*(extern[ \t]+(module[ \t]+)?)?PROXY_DECLARE_DATA .*;/ {
     gsub(/[*;\n\r]/, "")
     gsub(/\[.*\]/, "")
     add_symbol($NF)
 }
 
-
 END {
     printf("Added %d symbols to export list.\n", idx) > "/dev/stderr"
     # sort symbols with shell sort

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?rev=1728780&r1=1728779&r2=1728780&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Sat Feb  6 00:35:22 2016
@@ -222,7 +222,6 @@ endif
 #
 FILES_nlm_exports = \
 	@mod_proxy.imp \
-	proxy_module \
 	$(EOLIST)
 
 #