From 0c1f2f2e0908cc2d7a4093105b005de0a9e5cb0e Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Fri, 30 May 2008 19:31:22 +0000
Subject: [PATCH] Fixed blocking in phase 3 by reverting changeset:591 (for
 now).  See #65 and #498.

---
 CHANGES                 | 4 +++-
 apache2/mod_security2.c | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 3c0a6fae..84c30e58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-09 May 2008 - trunk
+30 May 2008 - trunk
 -------------------
 
+* Fixed blocking in phase 3.
+
 * Persistent counter updates are now atomic.
 
 * Force modules "mod_rpaf-2.0.c" and "mod_custom_header.c" to run before
diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index c26e37c0..61a63e5d 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -961,6 +961,8 @@ static void hook_insert_filter(request_rec *r) {
     }
 }
 
+/* NOTE: This is causing and endless loop when blocking in phase:3 */
+#if 0
 /**
  * Invoked whenever Apache starts processing an error. A chance
  * to insert ourselves into the output filter chain.
@@ -1002,6 +1004,7 @@ static void hook_insert_error_filter(request_rec *r) {
         }
     }
 }
+#endif
 
 #if (!defined(NO_MODSEC_API))
 /**
@@ -1105,7 +1108,9 @@ static void register_hooks(apr_pool_t *mp) {
 
     /* Filter hooks */
     ap_hook_insert_filter(hook_insert_filter, NULL, NULL, APR_HOOK_FIRST);
+#if 0
     ap_hook_insert_error_filter(hook_insert_error_filter, NULL, NULL, APR_HOOK_FIRST);
+#endif
 
     ap_register_input_filter("MODSECURITY_IN", input_filter,
         NULL, AP_FTYPE_CONTENT_SET);