Author: stas Date: Fri Dec 17 19:55:20 2004 New Revision: 122700 URL: http://svn.apache.org/viewcvs?view=rev&rev=122700 Log: non-threaded perl fixes for r122679
Modified: perl/modperl/trunk/src/modules/perl/modperl_config.c perl/modperl/trunk/src/modules/perl/modperl_types.h 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=122700&p1=perl/modperl/trunk/src/modules/perl/modperl_config.c&r1=122699&p2=perl/modperl/trunk/src/modules/perl/modperl_config.c&r2=122700 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_config.c (original) +++ perl/modperl/trunk/src/modules/perl/modperl_config.c Fri Dec 17 19:55:20 2004 @@ -446,17 +446,23 @@ { modperl_require_file_t **requires; int i; - +#ifdef USE_ITHREADS + pTHX; +#endif + requires = (modperl_require_file_t **)scfg->PerlPostConfigRequire->elts; for (i = 0; i < scfg->PerlPostConfigRequire->nelts; i++){ - if (modperl_require_file( requires[i]->perl, requires[i]->file, TRUE)){ +#ifdef USE_ITHREADS + aTHX = requires[i]->perl; +#endif + if (modperl_require_file(aTHX_ requires[i]->file, TRUE)){ MP_TRACE_d(MP_FUNC, "loaded Perl file: %s for server %s\n", - requires[i]->file, modperl_server_desc(s,p)); + requires[i]->file, modperl_server_desc(s, p)); } else { 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)); + requires[i]->file, modperl_server_desc(s, p)); return FALSE; } } @@ -472,6 +478,7 @@ PerlInterpreter *perl, apr_pool_t *p) { +#ifdef USE_ITHREADS modperl_require_file_t **requires; int i; @@ -483,6 +490,7 @@ requires[i]->perl = perl; } } +#endif return 1; } Modified: perl/modperl/trunk/src/modules/perl/modperl_types.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_types.h?view=diff&rev=122700&p1=perl/modperl/trunk/src/modules/perl/modperl_types.h&r1=122699&p2=perl/modperl/trunk/src/modules/perl/modperl_types.h&r2=122700 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_types.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_types.h Fri Dec 17 19:55:20 2004 @@ -39,6 +39,13 @@ server_rec *s; } modperl_rcs_t; +typedef struct { + const char *file; +#ifdef USE_ITHREADS + PerlInterpreter *perl; +#endif +} modperl_require_file_t; + #ifdef USE_ITHREADS typedef struct modperl_list_t modperl_list_t; @@ -63,13 +70,6 @@ unsigned long tid; #endif }; - -typedef struct { - const char *file; -#ifdef USE_ITHREADS - PerlInterpreter *perl; -#endif -} modperl_require_file_t; typedef struct { /* s == startup grow
