Subject: [PATCH] Don't call modperl_threaded_mpm() et al. from XS code

From: Niko Tyni <[email protected]>
Date: Wed, 15 Oct 2014 11:20:02 +0300
Message-ID: <[email protected]>

Fixes: https://bugs.debian.org/765174

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1632172 13f79535-47bb-0310-9956-ffa450edef68

Author: Steve Hay

Changes

@@ -12,6 +12,9 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes
 
 =item 2.0.9-dev
 
+Don't call modperl_threaded_mpm() et al. from XS code. Fixes Debian Bug
+#765174. [Niko Tyni <[email protected]>]
+
 Make sure modperl_interp_select uses r->server rather than the passed s
 parameter to find the interpreter pool to pull an interpreter from. This
 fixes an issue with vhosts with a separate interpreter pool and runtime

src/modules/perl/modperl_common_log.c

@@ -53,6 +53,7 @@ void modperl_trace(const char *func, const char *fmt, ...)
        http://apr.apache.org/docs/apr/1.4/group__apr__lib.html#gad2cd3594aeaafd45931d1034965f48c1
      */
 
+#ifndef MP_IN_XS
     /* PERL_GET_CONTEXT yields nonsense until the first interpreter is
      * created. Hence the modperl_is_running() question. */
     if (modperl_threaded_mpm()) {
@@ -77,6 +78,7 @@ void modperl_trace(const char *func, const char *fmt, ...)
         apr_file_printf(logfile, "[pid=%lu] ", (unsigned long)getpid());
 #endif
     }
+#endif
 
     if (func && *func) {
         apr_file_printf(logfile, "%s: ", func);