You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by to...@apache.org on 2012/02/08 18:16:42 UTC
svn commit: r1241987 - in /perl/modperl/branches/threading/src/modules/perl:
mod_perl.c modperl_interp.c
Author: torsten
Date: Wed Feb 8 17:16:41 2012
New Revision: 1241987
URL: http://svn.apache.org/viewvc?rev=1241987&view=rev
Log:
similar to r1241583: make sure r->server is used to identify the interpreter
pool to pull from at runtime.
Modified:
perl/modperl/branches/threading/src/modules/perl/mod_perl.c
perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
Modified: perl/modperl/branches/threading/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/mod_perl.c?rev=1241987&r1=1241986&r2=1241987&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/mod_perl.c Wed Feb 8 17:16:41 2012
@@ -740,11 +740,9 @@ static int modperl_hook_create_request(r
MP_dRCFG;
#ifdef USE_ITHREADS
- if (modperl_threaded_mpm()) {
- MP_TRACE_i(MP_FUNC, "setting userdata MODPERL_R in pool %#lx to %lx",
- (unsigned long)r->pool, (unsigned long)r);
- (void)apr_pool_userdata_set((void *)r, "MODPERL_R", NULL, r->pool);
- }
+ MP_TRACE_i(MP_FUNC, "setting userdata MODPERL_R in pool %#lx to %lx",
+ (unsigned long)r->pool, (unsigned long)r);
+ (void)apr_pool_userdata_set((void *)r, "MODPERL_R", NULL, r->pool);
#endif
modperl_config_req_init(r, rcfg);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_interp.c?rev=1241987&r1=1241986&r2=1241987&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_interp.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_interp.c Wed Feb 8 17:16:41 2012
@@ -345,10 +345,10 @@ modperl_interp_t *modperl_interp_pool_se
server_rec *s)
{
int is_startup = (p == s->process->pconf);
- MP_dSCFG(s);
modperl_interp_t *interp = NULL;
if (is_startup) {
+ MP_dSCFG(s);
if (scfg) {
MP_TRACE_i(MP_FUNC, "using parent interpreter at startup");
@@ -382,17 +382,6 @@ modperl_interp_t *modperl_interp_pool_se
return interp;
}
- else if (!modperl_threaded_mpm()) {
- MP_TRACE_i(MP_FUNC, "using parent interpreter in non-threaded mode\n");
-
- /* since we are not running in threaded mode PERL_SET_CONTEXT
- * is not necessary */
- /* PERL_SET_CONTEXT(scfg->mip->parent->perl); */
- /* let the perl interpreter point back to its interp */
- modperl_thx_interp_set(scfg->mip->parent->perl, scfg->mip->parent);
-
- return scfg->mip->parent;
- }
else {
request_rec *r;
apr_pool_userdata_get((void **)&r, "MODPERL_R", p);