httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r595333 - /httpd/httpd/branches/2.2.x/STATUS
Date Thu, 15 Nov 2007 15:38:02 GMT
Author: davi
Date: Thu Nov 15 07:38:01 2007
New Revision: 595333

URL: http://svn.apache.org/viewvc?rev=595333&view=rev
Log:
Refresh patch for 2.2.x and reset votes.

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=595333&r1=595332&r2=595333&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Nov 15 07:38:01 2007
@@ -270,10 +270,13 @@
 
    * mod_ssl: Don't use the pconf pool for allocating memory pointed by
      a local static variable. PR 43865.
+     trunk:
          http://svn.apache.org/viewvc?view=rev&revision=591384
+     2.2.x:
+        Trunk patch has a simple conflict due to name change of
+        a optional function variable, refreshed patch:
+        http://people.apache.org/~davi/ssl_engine_var_safe.patch
      +1: davi
-     -1: rpluem says: There are two conflicts when merging ssl_engine_vars.c.
-         One is caused by r289444 and the other one is unknown.
 
 PATCHES/ISSUES THAT ARE STALLED
 



Mime
View raw message