You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/08/09 15:38:39 UTC
svn commit: r1371208 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
modules/mappers/mod_rewrite.c
Author: jim
Date: Thu Aug 9 13:38:38 2012
New Revision: 1371208
URL: http://svn.apache.org/viewvc?rev=1371208&view=rev
Log:
Merge r1369995, r1369999, r1370001 from trunk:
Use apr_pcalloc for rewritemap_entry struct, to avoid uninitialized entries.
PR: 53663
Submitted by: Mikhail T. <mi apache aldan algebra com>
remove now unecessary assignment
Add changes entry for r1369995, r1369999
Submitted by: sf
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1369995,1369999,1370001
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1371208&r1=1371207&r2=1371208&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Aug 9 13:38:38 2012
@@ -7,6 +7,9 @@ Changes with Apache 2.4.3
possible XSS for a site where untrusted users can upload files to
a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
+ *) mod_rewrite: Fix crash with dbd RewriteMaps. PR 53663. [Mikhail T.
+ <mi apache aldan algebra com>]
+
*) mod_ssl: Add new directive SSLCompression to disable TLS-level
compression. PR 53219. [Björn Jacke <bjoern j3e de>, Stefan Fritsch]
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1371208&r1=1371207&r2=1371208&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Thu Aug 9 13:38:38 2012
@@ -2936,8 +2936,7 @@ static const char *cmd_rewritemap(cmd_pa
sconf = ap_get_module_config(cmd->server->module_config, &rewrite_module);
- newmap = apr_palloc(cmd->pool, sizeof(rewritemap_entry));
- newmap->func = NULL;
+ newmap = apr_pcalloc(cmd->pool, sizeof(rewritemap_entry));
if (strncasecmp(a2, "txt:", 4) == 0) {
if ((fname = ap_server_root_relative(cmd->pool, a2+4)) == NULL) {
@@ -2948,7 +2947,6 @@ static const char *cmd_rewritemap(cmd_pa
newmap->type = MAPTYPE_TXT;
newmap->datafile = fname;
newmap->checkfile = fname;
- newmap->checkfile2= NULL;
newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
(void *)cmd->server, a1);
}
@@ -2961,7 +2959,6 @@ static const char *cmd_rewritemap(cmd_pa
newmap->type = MAPTYPE_RND;
newmap->datafile = fname;
newmap->checkfile = fname;
- newmap->checkfile2= NULL;
newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
(void *)cmd->server, a1);
}
@@ -3035,17 +3032,10 @@ static const char *cmd_rewritemap(cmd_pa
}
newmap->type = MAPTYPE_PRG;
- newmap->datafile = NULL;
newmap->checkfile = newmap->argv[0];
- newmap->checkfile2= NULL;
- newmap->cachename = NULL;
}
else if (strncasecmp(a2, "int:", 4) == 0) {
newmap->type = MAPTYPE_INT;
- newmap->datafile = NULL;
- newmap->checkfile = NULL;
- newmap->checkfile2= NULL;
- newmap->cachename = NULL;
newmap->func = (char *(*)(request_rec *,char *))
apr_hash_get(mapfunc_hash, a2+4, strlen(a2+4));
if (newmap->func == NULL) {
@@ -3062,12 +3052,9 @@ static const char *cmd_rewritemap(cmd_pa
newmap->type = MAPTYPE_TXT;
newmap->datafile = fname;
newmap->checkfile = fname;
- newmap->checkfile2= NULL;
newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
(void *)cmd->server, a1);
}
- newmap->fpin = NULL;
- newmap->fpout = NULL;
if (newmap->checkfile
&& (apr_stat(&st, newmap->checkfile, APR_FINFO_MIN,