diff options
| -rw-r--r-- | build/NWGNUmakefile | 7 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 4 | ||||
| -rw-r--r-- | modules/cache/NWGNUcach_dsk | 6 | ||||
| -rw-r--r-- | modules/cache/mod_cache.imp | 12 |
4 files changed, 11 insertions, 18 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 8e588aeae7..a230bfa3ec 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 +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp libs :: chkapr $(NWOS)/chartables.c @@ -31,6 +31,10 @@ $(DAV)/main/dav.imp : make_nw_export.awk $(DAV)/main/mod_dav.h @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ +$(STDMOD)/cache/mod_cache.imp: make_nw_export.awk $(STDMOD)/cache/mod_cache.h $(STDMOD)/cache/cache_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 $^ >$@ @@ -114,6 +118,7 @@ clean :: $(call DEL,$(SRC)/include/ap_config_layout.h) $(call DEL,$(PCRE)/config.h) $(call DEL,$(PCRE)/pcre.h) + $(call DEL,$(STDMOD)/cache/mod_cache.imp) $(call DEL,$(DAV)/main/dav.imp) $(call DEL,$(NWOS)/httpd.imp) $(call DEL,nw_export.i) diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index da2765d4a7..9334c5d510 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -29,8 +29,8 @@ function add_symbol(sym_name) { #/ap_some_name/{next} /ap_mpm_pod_/{next} -/^[ \t]*(AP|DAV)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*(AP|DAV)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV|CACHE)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV|CACHE)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") add_symbol($0) diff --git a/modules/cache/NWGNUcach_dsk b/modules/cache/NWGNUcach_dsk index be925da171..1c45f344f0 100644 --- a/modules/cache/NWGNUcach_dsk +++ b/modules/cache/NWGNUcach_dsk @@ -99,7 +99,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = dsk_cach +NLM_NAME = cach_dsk # # This is used by the link '-desc ' directive. @@ -111,7 +111,7 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Memory Cache Sub-Module # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # -NLM_THREAD_NAME = dsk_cach +NLM_THREAD_NAME = $(NLM_NAME) # # If this is specified, it will override VERSION value in @@ -160,7 +160,7 @@ XDCDATA = # If there is an NLM target, put it here # TARGET_nlm = \ - $(OBJDIR)/dsk_cach.nlm \ + $(OBJDIR)/$(NLM_NAME).nlm \ $(EOLIST) # diff --git a/modules/cache/mod_cache.imp b/modules/cache/mod_cache.imp index 71a285c2f0..e69de29bb2 100644 --- a/modules/cache/mod_cache.imp +++ b/modules/cache/mod_cache.imp @@ -1,12 +0,0 @@ - (MODCACHE) - ap_cache_check_allowed, - ap_cache_current_age, - ap_cache_liststr, - ap_cache_tokstr, - ap_cache_hex2usec, - ap_cache_usec2hex, - ap_cache_generate_name, - ap_cache_cacheable_headers, - ap_cache_cacheable_headers_in, - ap_cache_cacheable_headers_out - |