[tcl-rivet] 02/05: new flag for bridges designed for fork capable MPMs

[mx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git

commit d581f4bfc645ce04633155836135024023df5c5c
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Wed Jan 16 22:26:53 2019 +0100

    new flag for bridges designed for fork capable MPMs
---
 src/mod_rivet_ng/rivet_lazy_mpm.c    |  3 ++-
 src/mod_rivet_ng/rivet_prefork_mpm.c |  4 +++-
 src/mod_rivet_ng/rivet_types.h       | 21 +++++++++++++++++++--
 src/mod_rivet_ng/rivet_worker_mpm.c  |  1 +
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/mod_rivet_ng/rivet_lazy_mpm.c b/src/mod_rivet_ng/rivet_lazy_mpm.c
index a573fdb..c579e98 100644
--- a/src/mod_rivet_ng/rivet_lazy_mpm.c
+++ b/src/mod_rivet_ng/rivet_lazy_mpm.c
@@ -527,5 +527,6 @@ RIVET_MPM_BRIDGE {
     Lazy_MPM_Request,
     Lazy_MPM_Finalize,
     Lazy_MPM_ExitHandler,
-    Lazy_MPM_Interp
+    Lazy_MPM_Interp,
+    false
 };
diff --git a/src/mod_rivet_ng/rivet_prefork_mpm.c b/src/mod_rivet_ng/rivet_prefork_mpm.c
index ad39d31..1eeaba1 100644
--- a/src/mod_rivet_ng/rivet_prefork_mpm.c
+++ b/src/mod_rivet_ng/rivet_prefork_mpm.c
@@ -327,6 +327,8 @@ RIVET_MPM_BRIDGE {
     Prefork_Bridge_Request,
     Prefork_Bridge_Finalize,
     Prefork_Bridge_ExitHandler,
-    Prefork_Bridge_Interp
+    Prefork_Bridge_Interp,
+    Prefork_MPM_Interp,
+    true
 };
 
diff --git a/src/mod_rivet_ng/rivet_types.h b/src/mod_rivet_ng/rivet_types.h
index 8f261b0..04e060b 100644
--- a/src/mod_rivet_ng/rivet_types.h
+++ b/src/mod_rivet_ng/rivet_types.h
@@ -27,10 +27,27 @@
 #include <httpd.h>
 #include <tcl.h>
 
+/* Definition suggested in
+ *
+ * https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Particular-Headers.html 
+ *
+ * in order to have a portable definition of the 'bool' data type
+ */
+
 #ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
+# include <stdbool.h>
 #else
-typedef enum {false=0, true=1} bool;
+# ifndef HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
 #endif
 
 typedef struct _ApacheRequest   ApacheRequest;
diff --git a/src/mod_rivet_ng/rivet_worker_mpm.c b/src/mod_rivet_ng/rivet_worker_mpm.c
index f3d9f04..5992d20 100644
--- a/src/mod_rivet_ng/rivet_worker_mpm.c
+++ b/src/mod_rivet_ng/rivet_worker_mpm.c
@@ -789,4 +789,5 @@ RIVET_MPM_BRIDGE {
     Worker_MPM_Finalize,
     Worker_MPM_ExitHandler,
     Worker_MPM_Interp
+    false,
 };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org