From a2f6d6dc9e9c187bd7c5782e6d9c6d584ce35753 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Mon, 10 Jun 2013 14:24:33 +0000 Subject: [PATCH] mod_remoteip: close file in error path trunk patch: http://svn.apache.org/r1491234 Submitted by: jailletc36 Reviewed by: covener, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491464 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ STATUS | 5 ----- modules/metadata/mod_remoteip.c | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index c2682bc006..b4352fc8e9 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ Changes with Apache 2.4.5 + *) mod_remoteip: close file in error path. [Christophe Jaillet] + *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to) Server pools, new apr functions for the request_rec table, input/output filters, LuaCodeCache, LuaMapHandler and multipart form data handling. diff --git a/STATUS b/STATUS index 44578d97f9..a3d5db6363 100644 --- a/STATUS +++ b/STATUS @@ -100,11 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works modulo CHANGES and mmn bump +1: minfrin, jim, sf - * mod_remoteip: close file in error path - trunk patch: http://svn.apache.org/r1491234 - 2.4.x patch: trunk patch works - +1: jailletc36, covener, minfrin - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index 79aa6a940a..b0af3a3289 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -203,6 +203,7 @@ static const char *proxylist_read(cmd_parms *cmd, void *cfg, } errmsg = proxies_set(cmd, cfg, arg); if (errmsg) { + ap_cfg_closefile(cfp); errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s", errmsg, cfp->line_number, filename); return errmsg; -- 2.40.0