]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
projects / thirdparty / apache / httpd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fbd8b1 576f3d7)
update merge of changes in 2.4.x
authorStefan Eissing <icing@apache.org>
Thu, 19 Nov 2015 14:58:52 +0000 (14:58 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 19 Nov 2015 14:58:52 +0000 (14:58 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@1715192 13f79535-47bb-0310-9956-ffa450edef68

1  2 
modules/ssl/ssl_engine_io.c patch | diff1 | diff2 | blob | history
server/core.c patch | diff1 | diff2 | blob | history

diff --cc modules/ssl/ssl_engine_io.c
Simple merge
diff --cc server/core.c
Simple merge
Mirror of https://github.com/apache/httpd.git