You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ja...@apache.org on 2018/05/27 20:38:39 UTC

svn commit: r1832348 - /httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c

Author: jailletc36
Date: Sun May 27 20:38:39 2018
New Revision: 1832348

URL: http://svn.apache.org/viewvc?rev=1832348&view=rev
Log:
All error handling paths of this function call 'apr_socket_close()' , except this one.
So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53015

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=1832348&r1=1832347&r2=1832348&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Sun May 27 20:38:39 2018
@@ -305,6 +305,7 @@ static int proxy_connect_handler(request
         backconn->aborted = 1;
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01022)
                       "pre_connection setup failed (%d)", rc);
+        apr_socket_close(sock);
         return HTTP_INTERNAL_SERVER_ERROR;
     }