Commit 6a73670a authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1555631 from trunk:

Fix config merging of SSLOCSPEnable and SSLOCSPOverrideResponder.

Submitted by: trawick, Frank Meier <frank.meier ergon.ch>
Reviewed by: rpluem, ylavic, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1836472 13f79535-47bb-0310-9956-ffa450edef68
parent 3f4766c9
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment