]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 90969b7) | patch
Merge r1824811 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 20 Feb 2018 13:02:54 +0000 (13:02 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 20 Feb 2018 13:02:54 +0000 (13:02 +0000)
commit222e916572924072a167915b47914463fab4cab1
tree9e2fdae7a7acdf18c1ad419bf77b729e3be84afctree
parent90969b7afc5de0a663d79a297f6aa3c784871872commit | diff
Merge r1824811 from trunk:

10 years after r567503 , fix this properly.

The lock is created in post_config, so we can't copy it
around in a merge_server_config() callback.

Submitted by: covener
Reviewed by: covener, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824872 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | blame | history
modules/ldap/util_ldap.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git