granicus.if.org Git - apache/commit

author	Eric Covener <covener@apache.org>
	Wed, 14 Jan 2015 13:28:00 +0000 (13:28 +0000)
committer	Eric Covener <covener@apache.org>
	Wed, 14 Jan 2015 13:28:00 +0000 (13:28 +0000)
commit	bf91e089a09ddeaab17cf9e97558f2aa29cf7eca
tree	dbed12698bf541fd0fd849c55ecebbbd58628868	tree \| snapshot
parent	7276b0dfc40edce72aeccb1b50cb03c70390ec9c	commit \| diff

Merge the following revisions from trunk:

     trunk patch: http://svn.apache.org/r1588544 (rewrite+UDS)
                  http://svn.apache.org/r1641636 ('using default worker' msg tweak)
                  http://svn.apache.org/r1647005 (tcp reuse)
                  http://svn.apache.org/r1647009 (uds reuse)
                  http://svn.apache.org/r1647334 (uds reuse fix)

    + 1 additional de_socketfy call in mod_proxy

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1651662 13f79535-47bb-0310-9956-ffa450edef68

CHANGES		diff \| blob \| history
docs/manual/mod/mod_proxy.xml		diff \| blob \| history
docs/manual/mod/mod_proxy_fcgi.xml		diff \| blob \| history
include/ap_mmn.h		diff \| blob \| history
modules/mappers/mod_rewrite.c		diff \| blob \| history
modules/proxy/mod_proxy.c		diff \| blob \| history
modules/proxy/mod_proxy.h		diff \| blob \| history
modules/proxy/mod_proxy_fcgi.c		diff \| blob \| history
modules/proxy/proxy_util.c		diff \| blob \| history