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 st...@apache.org on 2005/02/04 16:34:55 UTC
svn commit: r151364 - in perl/modperl/trunk: Changes
src/modules/perl/mod_perl.c
Author: stas
Date: Fri Feb 4 07:34:54 2005
New Revision: 151364
URL: http://svn.apache.org/viewcvs?view=rev&rev=151364
Log:
win32 needs PERL_SYS_INIT3/PERL_SYS_TERM calls [Steve Hay
<st...@uk.radan.com>]
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/src/modules/perl/mod_perl.c
Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=151363&r2=151364
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Feb 4 07:34:54 2005
@@ -12,6 +12,9 @@
=item 1.999_22-dev
+win32 needs PERL_SYS_INIT3/PERL_SYS_TERM calls [Steve Hay
+<st...@uk.radan.com>]
+
Fix broken MP_STATIC_EXTS=1 build. [Gozer]
Perl -Duse64bit fix. Pointers can't just be generically
Modified: perl/modperl/trunk/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/mod_perl.c?view=diff&r1=151363&r2=151364
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.c Fri Feb 4 07:34:54 2005
@@ -542,11 +542,17 @@
*/
static apr_status_t modperl_sys_init(void)
{
+ int argc = 0;
+ char **argv = NULL, **env = NULL;
+
MP_TRACE_i(MP_FUNC, "mod_perl sys init\n");
-#if 0 /*XXX*/
- PERL_SYS_INIT(0, NULL);
+ /* not every OS uses those vars in PERL_SYS_INIT3 macro */
+ argc = argc; argv = argv; env = env;
+ PERL_SYS_INIT3(&argc, &argv, &env);
+
+#if 0 /*XXX*/
#ifdef PTHREAD_ATFORK
if (!ap_exists_config_define("PERL_PTHREAD_ATFORK_DONE")) {
PTHREAD_ATFORK(Perl_atfork_lock,
@@ -581,9 +587,8 @@
modperl_perl_pp_unset_all();
-#if 0 /*XXX*/
PERL_SYS_TERM();
-#endif
+
return APR_SUCCESS;
}