From: Jacob Champion Date: Fri, 6 Jan 2017 19:55:46 +0000 (+0000) Subject: sync merge with trunk X-Git-Tag: 2.5.0-alpha~805^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50462f0467a85ebe67cc84ac80577d0bcb813478;p=thirdparty%2Fapache%2Fhttpd.git sync merge with trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777707 13f79535-47bb-0310-9956-ffa450edef68 --- 50462f0467a85ebe67cc84ac80577d0bcb813478