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:15:26 UTC
svn commit: r1778032 - in /httpd/httpd/branches/trunk-test-integration: ./
docs/ include/ modules/cluster/ modules/core/ modules/lua/ modules/slotmem/
server/mpm/event/ server/mpm/worker/
Author: jchampion
Date: Mon Jan 9 19:15:26 2017
New Revision: 1778032
URL: http://svn.apache.org/viewvc?rev=1778032&view=rev
Log:
Finish cross-integration with trunk
Modified:
httpd/httpd/branches/trunk-test-integration/ (props changed)
httpd/httpd/branches/trunk-test-integration/docs/ (props changed)
httpd/httpd/branches/trunk-test-integration/include/ap_slotmem.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/cluster/config5.m4 (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/Makefile.in (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/config.m4 (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.dsp (props changed)
httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/ (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.h (props changed)
httpd/httpd/branches/trunk-test-integration/modules/slotmem/config.m4 (props changed)
httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_plain.c (props changed)
httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_shm.c (props changed)
httpd/httpd/branches/trunk-test-integration/server/mpm/event/config3.m4 (props changed)
httpd/httpd/branches/trunk-test-integration/server/mpm/worker/config3.m4 (props changed)
Propchange: httpd/httpd/branches/trunk-test-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1777251-1778028
+/httpd/httpd/trunk:1777251-1778028,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 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/wombat-integration/docs:723609-723841
-/httpd/httpd/trunk/docs:1777251-1778028
+/httpd/httpd/trunk/docs:1777251-1778028,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/include/ap_slotmem.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/include/ap_slotmem.h:1150158-1150173
-/httpd/httpd/trunk/include/ap_slotmem.h:1777709
+/httpd/httpd/trunk/include/ap_slotmem.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/cluster/config5.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/cluster/config5.m4:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/cluster/config.m4:723609-723841
-/httpd/httpd/trunk/modules/cluster/config5.m4:1777709
+/httpd/httpd/trunk/modules/cluster/config5.m4:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/Makefile.in
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/Makefile.in:1150158-1150173
-/httpd/httpd/trunk/modules/core/Makefile.in:1777709
+/httpd/httpd/trunk/modules/core/Makefile.in:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/config.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/config.m4:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/config9.m4:723609-723841
-/httpd/httpd/trunk/modules/core/config.m4:1777709
+/httpd/httpd/trunk/modules/core/config.m4:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_so.c:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.c:723609-723841
-/httpd/httpd/trunk/modules/core/mod_so.c:1777709
+/httpd/httpd/trunk/modules/core/mod_so.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/mod_so.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_so.h:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.h:723609-723841
-/httpd/httpd/trunk/modules/core/mod_so.h:1777709
+/httpd/httpd/trunk/modules/core/mod_so.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.c:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.c:723609-723841
-/httpd/httpd/trunk/modules/core/mod_watchdog.c:1777709
+/httpd/httpd/trunk/modules/core/mod_watchdog.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.dsp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.dsp:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.dsp:723609-723841
-/httpd/httpd/trunk/modules/core/mod_watchdog.dsp:1777709
+/httpd/httpd/trunk/modules/core/mod_watchdog.dsp:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/core/mod_watchdog.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/core/mod_watchdog.h:1150158-1150173
/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.h:723609-723841
-/httpd/httpd/trunk/modules/core/mod_watchdog.h:1777709
+/httpd/httpd/trunk/modules/core/mod_watchdog.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua:1150158-1150173
-/httpd/httpd/branches/wombat-integration/modules/wombat:723609-723841
-/httpd/httpd/trunk/modules/lua:1777709
+/httpd/httpd/branches/wombat-integration/modules/wombat:723609-723614
+/httpd/httpd/trunk/modules/lua:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_apr.c:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_apr.c:1777709
+/httpd/httpd/trunk/modules/lua/lua_apr.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_apr.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_apr.h:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_apr.h:1777709
+/httpd/httpd/trunk/modules/lua/lua_apr.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +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/trunk/modules/lua/lua_config.c:1777709
+/httpd/httpd/branches/wombat-integration/modules/wombat/config.c:723609-723614
+/httpd/httpd/trunk/modules/lua/lua_config.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_config.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_config.h:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_config.h:1777709
+/httpd/httpd/trunk/modules/lua/lua_config.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_request.c:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_request.c:1777709
+/httpd/httpd/trunk/modules/lua/lua_request.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_request.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_request.h:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_request.h:1777709
+/httpd/httpd/trunk/modules/lua/lua_request.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_vmprep.c:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_vmprep.c:1777709
+/httpd/httpd/trunk/modules/lua/lua_vmprep.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/lua_vmprep.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/lua/lua_vmprep.h:1150158-1150173
-/httpd/httpd/trunk/modules/lua/lua_vmprep.h:1777709
+/httpd/httpd/trunk/modules/lua/lua_vmprep.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +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/trunk/modules/lua/mod_lua.c:1777709
+/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.c:723609-723614
+/httpd/httpd/trunk/modules/lua/mod_lua.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/lua/mod_lua.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +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/trunk/modules/lua/mod_lua.h:1777709
+/httpd/httpd/branches/wombat-integration/modules/wombat/mod_wombat.h:723609-723614
+/httpd/httpd/trunk/modules/lua/mod_lua.h:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/slotmem/config.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/config.m4:1150158-1150173
-/httpd/httpd/trunk/modules/slotmem/config.m4:1777709
+/httpd/httpd/trunk/modules/slotmem/config.m4:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_plain.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/mod_slotmem_plain.c:1150158-1150173
-/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c:1777709
+/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/modules/slotmem/mod_slotmem_shm.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,2 +1,2 @@
/httpd/httpd/branches/revert-ap-ldap/modules/slotmem/mod_slotmem_shm.c:1150158-1150173
-/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c:1777709
+/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/server/mpm/event/config3.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/server/mpm/event/config3.m4:1150158-1150173
/httpd/httpd/branches/wombat-integration/server/mpm/event/config5.m4:723609-723841
-/httpd/httpd/trunk/server/mpm/event/config3.m4:1777709
+/httpd/httpd/trunk/server/mpm/event/config3.m4:1777709,1778031
Propchange: httpd/httpd/branches/trunk-test-integration/server/mpm/worker/config3.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 19:15:26 2017
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap/server/mpm/worker/config3.m4:1150158-1150173
/httpd/httpd/branches/wombat-integration/server/mpm/worker/config5.m4:723609-723841
-/httpd/httpd/trunk/server/mpm/worker/config3.m4:1777709
+/httpd/httpd/trunk/server/mpm/worker/config3.m4:1777709,1778031