]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6c4b9cd) | patch
Merge r1703248, r1827366 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:19:30 +0000 (21:19 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:19:30 +0000 (21:19 +0000)
commit459bcc1606452147e7d38a1008749efec38832c4
tree4e4f446a77dc6f580d2b4f839a4193eccaffc548tree | snapshot
parent6c4b9cdd2069bae4f6b59ee06d0a356094177962commit | diff
Merge r1703248, r1827366 from trunk:

core: Avoid a compiler warning when NO_LINGCLOSE is used (-Wunreachable-code).
Also, check c->aborted before apr_socket_shutdown() because it is set earlier,
and there is no point in calling shutdown() before close().

mod_ldap: fix format warnings.

Submitted by: ylavic
Reviewed by: jailletc36, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832491 13f79535-47bb-0310-9956-ffa450edef68
modules/ldap/util_ldap_cache.c diff | blob | history
modules/ldap/util_ldap_cache_mgr.c diff | blob | history
server/connection.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.