Commit d0112537 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent 014ac45e

CMakeLists.txt

+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

Makefile.in

+1 −1
Changes for Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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)

NWGNUmakefile

+1 −1
Changes for NWGNUmakefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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 \

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -575,12 +575,13 @@ 
 * 20180417.2 (2.5.1-dev)  Add AP_GETLINE_NOSPC_EOL flag to http_protocol.h

 * 20180417.3 (2.5.1-dev)  Add ap_fgetline() and AP_GETLINE_NONBLOCK flag

 * 20180422.1 (2.5.1-dev)  Axe ap_rgetline_core()

 * 20180606.1 (2.5.1-dev)  Move ap_{make,set}_etag() from module http to core

 */



#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20180422

#define MODULE_MAGIC_NUMBER_MAJOR 20180606

#endif

#define MODULE_MAGIC_NUMBER_MINOR 1                 /* 0...n */

libhttpd.dsp

+4 −4
Changes for libhttpd.dsp: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -453,10 +453,6 @@ SOURCE=.\modules\http\http_core.c 
# End Source File

# Begin Source File



SOURCE=.\modules\http\http_etag.c

# End Source File

# Begin Source File



SOURCE=.\modules\http\http_filters.c

# End Source File

# Begin Source File
@@ -549,6 +545,10 @@ SOURCE=.\include\util_ebcdic.h 
# End Source File

# Begin Source File



SOURCE=.\server\util_etag.c

# End Source File

# Begin Source File



SOURCE=.\server\util_expr_private.h

# End Source File

# Begin Source File