You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/06/06 21:04:21 UTC
svn commit: r1833083 - in /httpd/httpd/trunk: CMakeLists.txt Makefile.in
NWGNUmakefile include/ap_mmn.h libhttpd.dsp modules/http/config.m4
modules/http/http_etag.c server/Makefile.in server/util_etag.c
Author: ylavic
Date: Wed Jun 6 21:04:21 2018
New Revision: 1833083
URL: http://svn.apache.org/viewvc?rev=1833083&view=rev
Log:
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.
Added:
httpd/httpd/trunk/server/util_etag.c
- copied unchanged from r1833082, httpd/httpd/trunk/modules/http/http_etag.c
Removed:
httpd/httpd/trunk/modules/http/http_etag.c
Modified:
httpd/httpd/trunk/CMakeLists.txt
httpd/httpd/trunk/Makefile.in
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/libhttpd.dsp
httpd/httpd/trunk/modules/http/config.m4
httpd/httpd/trunk/server/Makefile.in
Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Wed Jun 6 21:04:21 2018
@@ -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
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Wed Jun 6 21:04:21 2018
@@ -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)
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Wed Jun 6 21:04:21 2018
@@ -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 \
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Wed Jun 6 21:04:21 2018
@@ -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 */
Modified: httpd/httpd/trunk/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/libhttpd.dsp?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/libhttpd.dsp (original)
+++ httpd/httpd/trunk/libhttpd.dsp Wed Jun 6 21:04:21 2018
@@ -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
Modified: httpd/httpd/trunk/modules/http/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/config.m4?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/config.m4 (original)
+++ httpd/httpd/trunk/modules/http/config.m4 Wed Jun 6 21:04:21 2018
@@ -2,7 +2,7 @@ dnl modules enabled in this directory by
APACHE_MODPATH_INIT(http)
-http_objects="http_core.lo http_protocol.lo http_request.lo http_filters.lo chunk_filter.lo byterange_filter.lo http_etag.lo"
+http_objects="http_core.lo http_protocol.lo http_request.lo http_filters.lo chunk_filter.lo byterange_filter.lo"
dnl mod_http should only be built as a static module for now.
dnl this will hopefully be "fixed" at some point in the future by
Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/Makefile.in?rev=1833083&r1=1833082&r2=1833083&view=diff
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Wed Jun 6 21:04:21 2018
@@ -7,7 +7,7 @@ SUBDIRS = mpm
LTLIBRARY_NAME = libmain.la
LTLIBRARY_SOURCES = \
- config.c log.c main.c vhost.c util.c util_fcgi.c \
+ config.c log.c main.c vhost.c util.c util_etag.c util_fcgi.c \
util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
connection.c listen.c util_mutex.c \
mpm_common.c mpm_unix.c mpm_fdqueue.c \