diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-06-06 23:04:21 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-06-06 23:04:21 +0200 |
| commit | 7711d39400b6b2a8d210fb85b32bad59cf2a9d49 (patch) | |
| tree | c0b9c528296ded037ca665ea4611d5224c464002 /NWGNUmakefile | |
| parent | * modules/http/http_request.c (ap_process_request_after_handler, (diff) | |
| download | apache2-7711d39400b6b2a8d210fb85b32bad59cf2a9d49.tar.xz apache2-7711d39400b6b2a8d210fb85b32bad59cf2a9d49.zip | |
Avoid cyclic dependency by moving ap_set_etag() from module http to core.
This function, along with ap_make_etag(), is used by the default_handler in
core.c, and in several modules other than builtin mod_http, breaking static
linking and httpdunit tests build.
The move is done by "svn move modules/http/http_etag.c server/util_etag.c".
MMN major bumped, not backportable (as is) to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833083 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index e11219570d..3cea406800 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -242,7 +242,6 @@ FILES_nlm_objs = \ $(OBJDIR)/http_request.o \ $(OBJDIR)/byterange_filter.o \ $(OBJDIR)/chunk_filter.o \ - $(OBJDIR)/http_etag.o \ $(OBJDIR)/http_filters.o \ $(OBJDIR)/listen.o \ $(OBJDIR)/log.o \ @@ -273,6 +272,7 @@ FILES_nlm_objs = \ $(OBJDIR)/util_charset.o \ $(OBJDIR)/util_cookies.o \ $(OBJDIR)/util_debug.o \ + $(OBJDIR)/util_etag.o \ $(OBJDIR)/util_expr_eval.o \ $(OBJDIR)/util_expr_parse.o \ $(OBJDIR)/util_expr_scan.o \ |