You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/06/10 16:24:34 UTC
svn commit: r1491464 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/metadata/mod_remoteip.c
Author: minfrin
Date: Mon Jun 10 14:24:33 2013
New Revision: 1491464
URL: http://svn.apache.org/r1491464
Log:
mod_remoteip: close file in error path
trunk patch: http://svn.apache.org/r1491234
Submitted by: jailletc36
Reviewed by: covener, minfrin
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1491234
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1491464&r1=1491463&r2=1491464&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jun 10 14:24:33 2013
@@ -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.
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1491464&r1=1491463&r2=1491464&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun 10 14:24:33 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c?rev=1491464&r1=1491463&r2=1491464&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c Mon Jun 10 14:24:33 2013
@@ -203,6 +203,7 @@ static const char *proxylist_read(cmd_pa
}
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;