merges++

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

diff --git a/STATUS b/STATUS
index bd75021566fe0589836f61a1ea50ffd0ade51bd5..2d788acc766f8316f3f1ce6be1afab0a6ad574aa 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/07/30 14:11:16 $]
+Last modified at [$Date: 2003/07/30 19:08:46 $]
 
 Release:
 
@@ -247,6 +247,11 @@ PATCHES TO PORT FROM 2.1
         modules/ssl/ssl_engine_vars.c:  r1.24
       +1: trawick, nd
 
+    * mod_ssl: Fix segfaults after renegotiation failure.  PR 21370
+        modules/ssl/ssl_engine_io.c:  r1.110
+        modules/ssl/ssl_engine_kernel.c: r1.196
+      +1: trawick
+
     * use the appropriate folder icon, even if there's a directoryindex
       listed file in the particular folder. PR 9587
         modules/generators/mod_autoindex.c r1.120