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 /Makefile.in | |
| 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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 43d1879a9f..802aaa6390 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,9 +7,9 @@ PROGRAM_SOURCES = modules.c PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c PROGRAM_DEPENDENCIES = \ - server/libmain.la \ $(BUILTIN_LIBS) \ $(MPM_LIB) \ + server/libmain.la \ os/$(OS_DIR)/libos.la sbin_PROGRAMS = $(PROGRAM_NAME) |