summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-06-06 21:04:21 +0000
committerYann Ylavic <ylavic@apache.org>2018-06-06 21:04:21 +0000
commit7711d39400b6b2a8d210fb85b32bad59cf2a9d49 (patch)
treec0b9c528296ded037ca665ea4611d5224c464002 /CMakeLists.txt
parent07ab2af39d3a670e92f5e1e59749b8ecd51f9e48 (diff)
downloadhttpd-7711d39400b6b2a8d210fb85b32bad59cf2a9d49.tar.gz
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 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34db575bb9..429ce54c71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -651,7 +651,6 @@ SET(LIBHTTPD_SOURCES
modules/http/byterange_filter.c
modules/http/chunk_filter.c
modules/http/http_core.c
- modules/http/http_etag.c
modules/http/http_filters.c
modules/http/http_protocol.c
modules/http/http_request.c
@@ -680,6 +679,7 @@ SET(LIBHTTPD_SOURCES
server/util_cfgtree.c
server/util_cookies.c
server/util_debug.c
+ server/util_etag.c
server/util_expr_eval.c
server/util_expr_parse.c
server/util_fcgi.c