]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 35b5d45) | patch
Merge r1555631 from trunk:
authorJoe Orton <jorton@apache.org>
Mon, 23 Jul 2018 08:54:29 +0000 (08:54 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 23 Jul 2018 08:54:29 +0000 (08:54 +0000)
commitff71be64ee0b0ffec6b4230635954455deef7f24
treea70804e6bcf34962ffb3f279c30be738fd6d09e4tree
parent35b5d45859092d9e03921abc057e833a7c9bf8afcommit | diff
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
CHANGES diff | blob | blame | history
modules/ssl/ssl_engine_ocsp.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git