tree 6f20fa0211a0bc68b699159d02087c6e370d29a7
parent ebd99cf87b9d869c541b08ac53e836e14b4d34a6
author Joe Orton <jorton@apache.org> 1487355287 +0000
committer Joe Orton <jorton@apache.org> 1487355287 +0000

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