]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
merge of 1708107,1709587,1709602,1709995,1710231,1710419,1710572,1710583 from trunk...
authorStefan Eissing <icing@apache.org>
Wed, 4 Nov 2015 15:15:16 +0000 (15:15 +0000)
committerStefan Eissing <icing@apache.org>
Wed, 4 Nov 2015 15:15:16 +0000 (15:15 +0000)
commit8fbd8b191af5ec3218e91d3ae41a16d5813c7f5d
tree1825b6e2554cd42453a0c143a808d2fad060a4aa
parentcf457d9cbd032c73332b6b339154828adb485f77
merge of 1708107,1709587,1709602,1709995,1710231,1710419,1710572,1710583 from trunk, addition of master conn_rec*, minor bump of mmn

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@1712567 13f79535-47bb-0310-9956-ffa450edef68
include/ap_mmn.h
include/http_protocol.h
include/httpd.h
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_io.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_engine_vars.c
modules/ssl/ssl_private.h
server/core.c
server/protocol.c