no patch to 5.6.0 is needed when PERL_SET_CONTEXT is properly used

tell perl_clone() not to clone the stacks (requires scopestack_ix hack)
PR:
Obtained from:
Submitted by:
Reviewed by:


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

Author: dougm

00README_FIRST

@@ -8,8 +8,7 @@ more detailed design docs, etc. will follow along with updates here
 and on the list
 
 if you want to try building with an interpreter pool, you'll need Perl
-5.6.0 with patches/perl_no_get_context.pat applied and Perl built like 
-so:
+5.6.0 built like so:
 
 % ./Configure -des -Dusethreads
 

Makefile.PL

@@ -26,7 +26,7 @@ WriteMakefile(
     VERSION => $VERSION,
     macro => {
         MODPERL_SRC => $code->path,
-        PERL => $build->perl_config('perl5'),
+        PERL => $build->perl_config('perlpath'),
     },
     clean => {
         FILES => "@{ clean_files() }",

patches/perl_no_get_context.pat

@@ -339,6 +339,7 @@ int modperl_run_handlers(int idx, request_rec *r, conn_rec *c,
         /* Child{Init,Exit}, OpenLogs */
         aTHX = scfg->mip->parent->perl;
     }
+    PERL_SET_CONTEXT(aTHX);
 #endif
 
     MP_TRACE_h(MP_FUNC, "running %d %s handlers\n",

src/modules/perl/modperl_callback.c

@@ -24,8 +24,17 @@ modperl_interp_t *modperl_interp_new(ap_pool_t *p,
         );
 #endif
 
-        interp->perl = perl_clone(perl, TRUE);
+        interp->perl = perl_clone(perl, FALSE);
+        {
+            /* XXX: hack for bug fixed in 5.6.1 */
+            dTHXa(interp->perl);
+            if (PL_scopestack_ix == 0) {
+                ENTER;
+            }
+        }
+
         MpInterpCLONED_On(interp);
+        PERL_SET_CONTEXT(mip->parent->perl);
 
 #ifdef MP_USE_GTOP
         MP_TRACE_m_do(
@@ -50,6 +59,7 @@ void modperl_interp_destroy(modperl_interp_t *interp)
         MP_TRACE_i(MP_FUNC, "*error - still in use!*\n");
     }
 
+    PERL_SET_CONTEXT(interp->perl);
     PL_perl_destruct_level = 2;
     perl_destruct(interp->perl);
     perl_free(interp->perl);