]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
why can't we all just use malloc and free
authorJeff Trawick <trawick@apache.org>
Sat, 18 Mar 2006 00:53:52 +0000 (00:53 +0000)
committerJeff Trawick <trawick@apache.org>
Sat, 18 Mar 2006 00:53:52 +0000 (00:53 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@386777 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index d280afde85e8d4137392f87dfd6463562ba757ab..e913de51fca54466fb60cc96a4368c9fdd275ec1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -160,7 +160,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       (this assumes Colm's windows-build fixes are also backported)
       http://svn.apache.org/viewcvs.cgi?rev=348026&view=rev
       http://svn.apache.org/viewcvs.cgi?rev=354400&view=rev
-      +1 niq
+      +1 niq, trawick
 
     * Backport mod_authz_dbd (it's had some testing now)
       http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
@@ -218,4 +218,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs.cgi?view=rev&rev=386477
         http://svn.apache.org/viewcvs.cgi?view=rev&rev=386698
       +1: bnicholes
-
+         the two commits above plus this to get the contexts right:
+         http://svn.apache.org/viewcvs?rev=386751&view=rev
+      +1: trawick
+      trawick says: This needs a CHANGES entry by the time it gets merged
+                    to 2.2.