pre_connection hooks are run again, fixes #28

icing · Jun 22, 2015 · a253b4d · a253b4d
1 parent db318d1
commit a253b4d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+v0.7.2
+--------------------------------------------------------------------------------
+ * fixes crash with certain modules that (correctly) expected their 
+   pre_connection hooks to work. Solves #28
+ * fixes log statements and Makefile to compile sandbox on 32bit linux
+
 v0.7.1
 --------------------------------------------------------------------------------
  * h2_mplx now uses reference counting to enable a controlled destruction on

diff --git a/configure.ac b/configure.ac
@@ -14,7 +14,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([mod_h2], [0.7.1], [[email protected]])
+AC_INIT([mod_h2], [0.7.2], [[email protected]])
 
 LT_PREREQ([2.2.6])
 LT_INIT()

diff --git a/mod_h2/h2_task.c b/mod_h2/h2_task.c
@@ -126,19 +126,13 @@ static int h2_task_pre_conn(conn_rec* c, void *arg)
          */
         h2_tls_disable(c);
 
-
         ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c,
                       "h2_h2, pre_connection, found stream task");
 
         /* Add our own, network level in- and output filters.
          */
         ap_add_input_filter("H2_TO_H1", env, NULL, c);
         ap_add_output_filter("H1_TO_H2", env, NULL, c);
-
-        /* prevent processing by anyone else, including httpd core */
-        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c,
-                      "h2_stream(%s): task_pre_conn, taking over", env->id);
-        return DONE;
     }
     return OK;
 }

diff --git a/sandbox/test/conf/modules.conf b/sandbox/test/conf/modules.conf
@@ -55,7 +55,7 @@ LoadModule filter_module modules/mod_filter.so
 LoadModule mime_module modules/mod_mime.so
 LoadModule log_config_module modules/mod_log_config.so
 #LoadModule log_debug_module modules/mod_log_debug.so
-#LoadModule logio_module modules/mod_logio.so
+LoadModule logio_module modules/mod_logio.so
 LoadModule env_module modules/mod_env.so
 #LoadModule expires_module modules/mod_expires.so
 LoadModule headers_module modules/mod_headers.so