perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r123017 - /perl/modperl/trunk/src/modules/perl/modperl_config.c
Date Tue, 21 Dec 2004 23:06:43 GMT
Author: stas
Date: Tue Dec 21 15:06:42 2004
New Revision: 123017

URL: http://svn.apache.org/viewcvs?view=rev&rev=123017
Log:
restore the global perl context when done with perlpostconfigrequire

Modified:
   perl/modperl/trunk/src/modules/perl/modperl_config.c

Modified: perl/modperl/trunk/src/modules/perl/modperl_config.c
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_config.c?view=diff&rev=123017&p1=perl/modperl/trunk/src/modules/perl/modperl_config.c&r1=123016&p2=perl/modperl/trunk/src/modules/perl/modperl_config.c&r2=123017
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_config.c	(original)
+++ perl/modperl/trunk/src/modules/perl/modperl_config.c	Tue Dec 21 15:06:42 2004
@@ -447,6 +447,7 @@
     modperl_require_file_t **requires;
     int i;
 #ifdef USE_ITHREADS
+    PerlInterpreter *orig_perl = PERL_GET_CONTEXT;
     pTHX;
 #endif
     
@@ -463,9 +464,15 @@
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                          "Can't load Perl file: %s for server %s, exiting...",
                          requires[i]->file, modperl_server_desc(s, p));
+#ifdef USE_ITHREADS
+            PERL_SET_CONTEXT(orig_perl);
+#endif
             return FALSE;
         }
     }
+#ifdef USE_ITHREADS
+    PERL_SET_CONTEXT(orig_perl);
+#endif
 
     return TRUE;
 }

Mime
View raw message