From 19d5eb790ed19d4ef43a77509c8f7ec91bec75d8 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 21 Jan 2014 16:45:27 +0000 Subject: [PATCH] Merge r1534890 from trunk: axe attempt to close a previously-closed apr socket (clang scan-build says "uninitialized", but it doesn't know how apr_sockaddr_info_get() reports errors) Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560084 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/ssl/ssl_util_ocsp.c | 1 - 2 files changed, 6 deletions(-) diff --git a/STATUS b/STATUS index 5b260c5be1..fd9b4a2d1a 100644 --- a/STATUS +++ b/STATUS @@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * ssl_util_ocsp scan-build warning in old code - (the code is clearly wrong but completely harmless AFAICT) - trunk patch: https://svn.apache.org/r1534890 - 2.4.x patch: trunk patch works - +1: trawick, covener, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/ssl/ssl_util_ocsp.c b/modules/ssl/ssl_util_ocsp.c index 757df05f40..9016040528 100644 --- a/modules/ssl/ssl_util_ocsp.c +++ b/modules/ssl/ssl_util_ocsp.c @@ -96,7 +96,6 @@ static apr_socket_t *send_request(BIO *request, const apr_uri_t *uri, ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, c, APLOGNO(01974) "could not connect to OCSP responder '%s'", uri->hostinfo); - apr_socket_close(sd); return NULL; } -- 2.50.1