You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jc...@apache.org on 2017/01/09 19:12:23 UTC
svn commit: r1778031 - in /httpd/httpd/trunk: ./ docs/ include/
modules/cluster/ modules/core/ modules/lua/ modules/slotmem/
server/mpm/event/ server/mpm/worker/
Author: jchampion
Date: Mon Jan 9 19:12:22 2017
New Revision: 1778031
URL: http://svn.apache.org/viewvc?rev=1778031&view=rev
Log:
check: merge MPM-DSO fixes from feature branch
Modified:
httpd/httpd/trunk/ (props changed)
httpd/httpd/trunk/Makefile.in
httpd/httpd/trunk/docs/ (props changed)
httpd/httpd/trunk/include/ap_slotmem.h (props changed)
httpd/httpd/trunk/modules/cluster/config5.m4 (props changed)
httpd/httpd/trunk/modules/core/Makefile.in (props changed)
httpd/httpd/trunk/modules/core/config.m4 (props changed)
httpd/httpd/trunk/modules/core/mod_so.c (props changed)
httpd/httpd/trunk/modules/core/mod_so.h (props changed)
httpd/httpd/trunk/modules/core/mod_watchdog.c (props changed)
httpd/httpd/trunk/modules/core/mod_watchdog.dsp (props changed)
httpd/httpd/trunk/modules/core/mod_watchdog.h (props changed)
httpd/httpd/trunk/modules/lua/ (props changed)
httpd/httpd/trunk/modules/lua/lua_apr.c (props changed)
httpd/httpd/trunk/modules/lua/lua_apr.h (props changed)
httpd/httpd/trunk/modules/lua/lua_config.c (props changed)
httpd/httpd/trunk/modules/lua/lua_config.h (props changed)
httpd/httpd/trunk/modules/lua/lua_request.c (props changed)
httpd/httpd/trunk/modules/lua/lua_request.h (props changed)
httpd/httpd/trunk/modules/lua/lua_vmprep.c (props changed)
httpd/httpd/trunk/modules/lua/lua_vmprep.h (props changed)
httpd/httpd/trunk/modules/lua/mod_lua.c (props changed)
httpd/httpd/trunk/modules/lua/mod_lua.h (props changed)
httpd/httpd/trunk/modules/slotmem/config.m4 (props changed)
httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c (props changed)
httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (props changed)
httpd/httpd/trunk/server/mpm/event/config3.m4 (props changed)
httpd/httpd/trunk/server/mpm/worker/config3.m4 (props changed)
Propchange: httpd/httpd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
-/httpd/httpd/branches/trunk-test-integration:1777251-1777707
+/httpd/httpd/branches/trunk-test-integration:1777251-1778029
/httpd/httpd/branches/wombat-integration:723609-723841
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1778031&r1=1778030&r2=1778031&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Mon Jan 9 19:12:22 2017
@@ -28,7 +28,7 @@ DISTCLEAN_TARGETS = include/ap_config_a
build/pkg/pkginfo build/config_vars.sh bsd_converted
EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
httpd.spec
-PHONY_TARGETS := check check-conf check-include
+PHONY_TARGETS := check check-conf check-dirs check-include
include $(top_builddir)/build/rules.mk
include $(top_srcdir)/build/program.mk
@@ -328,16 +328,18 @@ check-conf:
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(MPM_MODULE)$(DSO_MODULES)" = "x"; then \
- sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ sed -e 's#@@ServerRoot@@#$(top_builddir)/check#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
+ -e 's#$(prefix)#$(top_builddir)/check#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
- -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@ServerRoot@@#$(top_builddir)/check#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
+ -e 's#$(prefix)#$(top_builddir)/check#g' \
-e 'p' \
< $$i; \
if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
@@ -351,7 +353,7 @@ check-conf:
have_cgid="0"; \
fi; \
for j in $(MPM_MODULES) "^EOL^"; do \
- path=$$(find "$(top_builddir)/modules" -name "mod_$$j.so"); \
+ path=$$(find "$(top_builddir)/server" -name "mod_$$j.so"); \
if test $$j != "^EOL^"; then \
if echo ",$(ENABLED_MPM_MODULE),"|$(EGREP) ",$$j," > /dev/null ; then \
loading_disabled=""; \
@@ -379,9 +381,10 @@ check-conf:
done; \
sed -e '1,/@@LoadModule@@/d' \
-e '/@@LoadModule@@/d' \
- -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@ServerRoot@@#$(top_builddir)/check#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
+ -e 's#$(prefix)#$(top_builddir)/check#g' \
< $$i; \
fi \
) > $(top_builddir)/check/conf/$$i; \
@@ -393,6 +396,13 @@ check-conf:
done ; \
done ;
+# Sometimes (e.g. when MPM DSOs are enabled) the test suite runs a full
+# configuration check on our in-tree build. To pass, we have to have all of the
+# correct directories, even though they won't be used.
+check-dirs:
+ @mkdir -p check/htdocs
+ @mkdir -p check/logs
+
# A version of apxs with the PREFIX overridden to point inside the build tree.
check/apxs:
mkdir -p check
@@ -408,7 +418,7 @@ check/build/config_vars.mk: build/config
echo "sbindir = $(top_builddir)" >> $@
# Run the Apache::Test suite if it has been configured with --with-test-suite.
-check: check-include check-conf check/build/config_vars.mk check/apxs
+check: check-include check-dirs check-conf check/build/config_vars.mk check/apxs
@if test "x$(TEST_SUITE_LOCATION)" = "xno"; then \
echo 'Re-run configure with the --with-test-suite option to enable in-tree tests.'; \
false; \
Propchange: httpd/httpd/trunk/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,4 +1,4 @@
/httpd/httpd/branches/2.4.x/docs:1537109
/httpd/httpd/branches/revert-ap-ldap/docs:1150158-1150173
-/httpd/httpd/branches/trunk-test-integration/docs:1777251-1777707
+/httpd/httpd/branches/trunk-test-integration/docs:1777251-1778029
/httpd/httpd/branches/wombat-integration/docs:723609-723841
Propchange: httpd/httpd/trunk/include/ap_slotmem.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/include/ap_slotmem.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/include/ap_slotmem.h:1777251-1778029
Propchange: httpd/httpd/trunk/modules/cluster/config5.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/cluster/config5.m4:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/cluster/config5.m4:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/cluster/config.m4:723609-723841
Propchange: httpd/httpd/trunk/modules/core/Makefile.in
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/Makefile.in:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/Makefile.in:1777251-1778029
Propchange: httpd/httpd/trunk/modules/core/config.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/config.m4:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/config.m4:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/config9.m4:723609-723841
Propchange: httpd/httpd/trunk/modules/core/mod_so.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_so.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.c:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.c:723609-723841
Propchange: httpd/httpd/trunk/modules/core/mod_so.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_so.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.h:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.h:723609-723841
Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.c:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.c:723609-723841
Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.dsp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.dsp:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.dsp:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.dsp:723609-723841
Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.h:1777251-1778029
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.h:723609-723841
Propchange: httpd/httpd/trunk/modules/lua/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua:1150158-1150173
-/httpd/httpd/branches/wombat-integration/modules/wombat:723609-723841
+/httpd/httpd/branches/trunk-test-integration/modules/lua:1777251-1778029
+/httpd/httpd/branches/wombat-integration/modules/wombat:723609-723614
Propchange: httpd/httpd/trunk/modules/lua/lua_apr.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_apr.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.c:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_apr.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_apr.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.h:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_config.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_config.c:1150158-1150173
-/httpd/httpd/branches/wombat-integration/modules/wombat/config.c:723609-723841
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.c:1777251-1778029
+/httpd/httpd/branches/wombat-integration/modules/wombat/config.c:723609-723614
Propchange: httpd/httpd/trunk/modules/lua/lua_config.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_config.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.h:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_request.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_request.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.c:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_request.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_request.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.h:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_vmprep.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.c:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_vmprep.h:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.h:1777251-1778029
Propchange: httpd/httpd/trunk/modules/lua/mod_lua.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/mod_lua.c:1150158-1150173
-/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.c:723609-723841
+/httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.c:1777251-1778029
+/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.c:723609-723614
Propchange: httpd/httpd/trunk/modules/lua/mod_lua.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/mod_lua.h:1150158-1150173
-/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.h:723609-723841
+/httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.h:1777251-1778029
+/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.h:723609-723614
Propchange: httpd/httpd/trunk/modules/slotmem/config.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/config.m4:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/slotmem/config.m4:1777251-1778029
Propchange: httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/mod_slotmem_plain.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_plain.c:1777251-1778029
Propchange: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/mod_slotmem_shm.c:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_shm.c:1777251-1778029
Propchange: httpd/httpd/trunk/server/mpm/event/config3.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/server/mpm/event/config3.m4:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/server/mpm/event/config3.m4:1777251-1778029
/httpd/httpd/branches/wombat-integration/server/mpm/event/config5.m4:723609-723841
Propchange: httpd/httpd/trunk/server/mpm/worker/config3.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:12:22 2017
@@ -1,2 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/server/mpm/worker/config3.m4:1150158-1150173
+/httpd/httpd/branches/trunk-test-integration/server/mpm/worker/config3.m4:1777251-1778029
/httpd/httpd/branches/wombat-integration/server/mpm/worker/config5.m4:723609-723841