From: André Malo <nd@apache.org>
Date: Fri, 27 Aug 2004 19:23:26 +0000 (+0000)
Subject: Fix memory leak.
X-Git-Tag: STRIKER_2_0_51_RC1^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd3e32c6f361672fa561341ecf3fdab303724d76;p=thirdparty%2Fapache%2Fhttpd.git

Fix memory leak.

PR: 27862
Reviewed by: Joe Orton, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104863 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index ee263f1dd4e..2cc707fe95a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.51
 
+  *) Fix memory leak in the cache handling of mod_rewrite. PR 27862.
+     [chunyan sheng <shengperson yahoo.com>, André Malo]
+
   *) Include directives no longer refuse to process symlinks on
      directories. Instead there's now a maximum nesting level
      of included directories (128 as distributed). This is configurable
diff --git a/STATUS b/STATUS
index 4c3e322d3e9..a4338283dce 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/08/27 19:11:20 $]
+Last modified at [$Date: 2004/08/27 19:23:24 $]
 
 Release:
 
@@ -156,10 +156,6 @@ PATCHES TO BACKPORT FROM 2.1
                     have already.  *shrug*  Regardless, patch looks okay...
        +1: nd, jerenkrantz
 
-    *) Fix memory leak in mod_rewrite. PR 27862. (2.0 + 1.3)
-         http://www.apache.org/~nd/mod_rewrite_fixleak.diff
-       +1: nd, jorton, trawick
-
     *) mod_log_config: Fix a bug which prevented request completion time
        from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
        processing.  PR 29696.  [Alois Treindl <alois astro.ch>]
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 6e9eddbe69c..290483710af 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4061,7 +4061,7 @@ static char *get_cache_string(cache *c, const char *res, int mode,
             return NULL;
         }
     }
-    return apr_pstrdup(c->pool, ce->value);
+    return ce->value;
 }
 
 static int cache_tlb_hash(char *key)