]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ebd99cf) | patch
Merge r1783440 from 2.2.x: 2.2.x-merge-http-strict 2.2.x-merge-http-strict
authorJoe Orton <jorton@apache.org>
Fri, 17 Feb 2017 18:14:47 +0000 (18:14 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 17 Feb 2017 18:14:47 +0000 (18:14 +0000)
commit478b3fe508349a7a3745611bff279e62cf9a39ac
tree6f20fa0211a0bc68b699159d02087c6e370d29a7tree
parentebd99cf87b9d869c541b08ac53e836e14b4d34a6commit | diff
Merge r1783440 from 2.2.x:

* server/core.c (merge_core_server_configs): Fix merging of
  HttpProtocolOptions from global to vhost context.

Reviewed by: jorton, wrowe, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1783441 13f79535-47bb-0310-9956-ffa450edef68
server/core.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git