Author: stevehay Date: Wed Oct 15 20:17:16 2014 New Revision: 1632172 URL: http://svn.apache.org/r1632172 Log: Subject: [PATCH] Don't call modperl_threaded_mpm() et al. from XS code From: Niko Tyni <nt...@debian.org> Date: Wed, 15 Oct 2014 11:20:02 +0300 Message-ID: <1413361202-5106-1-git-send-email-nt...@debian.org>
Fixes: https://bugs.debian.org/765174 Modified: perl/modperl/trunk/Changes perl/modperl/trunk/src/modules/perl/modperl_common_log.c Modified: perl/modperl/trunk/Changes URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1632172&r1=1632171&r2=1632172&view=diff ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Wed Oct 15 20:17:16 2014 @@ -12,6 +12,9 @@ Also refer to the Apache::Test changes l =item 2.0.9-dev +Don't call modperl_threaded_mpm() et al. from XS code. Fixes Debian Bug +#765174. [Niko Tyni <nt...@debian.org>] + 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 Modified: perl/modperl/trunk/src/modules/perl/modperl_common_log.c URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_common_log.c?rev=1632172&r1=1632171&r2=1632172&view=diff ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_common_log.c (original) +++ perl/modperl/trunk/src/modules/perl/modperl_common_log.c Wed Oct 15 20:17:16 2014 @@ -53,6 +53,7 @@ void modperl_trace(const char *func, con 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, con apr_file_printf(logfile, "[pid=%lu] ", (unsigned long)getpid()); #endif } +#endif if (func && *func) { apr_file_printf(logfile, "%s: ", func);
