richter 02/03/11 21:12:31
Modified: . Tag: Embperl2c epapinit.c epinit.c
Log:
Revision Changes Path
No revision
No revision
1.1.2.30 +2 -15 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- epapinit.c 12 Mar 2002 04:52:07 -0000 1.1.2.29
+++ epapinit.c 12 Mar 2002 05:12:30 -0000 1.1.2.30
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.29 2002/03/12 04:52:07 richter Exp $
+# $Id: epapinit.c,v 1.1.2.30 2002/03/12 05:12:30 richter Exp $
#
###################################################################################*/
@@ -129,18 +129,10 @@
void embperl_ApacheAddModule ()
{
- dTHX ;
- fprintf ((FILE *)stderr, "addmodule\n") ;
if (!ap_find_linked_module("embperl.c"))
{
embperl_module.name = "embperl.c" ;
-#if 1 //def WIN32
ap_add_module (&embperl_module) ;
-#else
- ap_add_loaded_module (&embperl_module) ;
- /* avoid warning when using AddModule */
- ap_remove_module (&embperl_module) ;
-#endif
}
}
@@ -150,10 +142,8 @@
{
int rc ;
pool * subpool = ap_make_sub_pool(p);
-
dTHX ;
- fprintf ((FILE *)stderr, "initmodule\n") ;
-
+
ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
ap_add_version_component ("Embperl/"VERSION) ;
@@ -167,9 +157,6 @@
{
module * m ;
- dTHX ;
-
- fprintf ((FILE *)stderr, "cleanupmodule \n") ;
/* make sure embperl module is removed before mod_perl in case mod_perl is
loaded dynamicly*/
if (m = ap_find_linked_module("mod_perl.c"))
if (m -> dynamic_load_handle)
1.1.2.41 +5 -3 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -r1.1.2.40 -r1.1.2.41
--- epinit.c 11 Mar 2002 14:08:27 -0000 1.1.2.40
+++ epinit.c 12 Mar 2002 05:12:30 -0000 1.1.2.41
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epinit.c,v 1.1.2.40 2002/03/11 14:08:27 richter Exp $
+# $Id: epinit.c,v 1.1.2.41 2002/03/12 05:12:30 richter Exp $
#
###################################################################################*/
@@ -708,8 +708,10 @@
}
#endif
- if (!pMainPool)
- pMainPool = ep_init_alloc() ;
+ if (pMainPool)
+ return ok ; /* initialization has already be done */
+
+ pMainPool = ep_init_alloc() ;
if ((rc = embperl_SetupThread (aTHX_ &pThread)) != ok)
return rc ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
