richter 02/03/01 13:42:47
Modified: . Tag: Embperl2c Embperl.pm epapinit.c
test/conf Tag: Embperl2c httpd.conf.src
Log:
apache config
Revision Changes Path
No revision
No revision
1.118.4.92 +4 -13 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.91
retrieving revision 1.118.4.92
diff -u -r1.118.4.91 -r1.118.4.92
--- Embperl.pm 27 Feb 2002 11:58:23 -0000 1.118.4.91
+++ Embperl.pm 1 Mar 2002 21:42:46 -0000 1.118.4.92
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.91 2002/02/27 11:58:23 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.92 2002/03/01 21:42:46 richter Exp $
#
###################################################################################
@@ -56,18 +56,9 @@
-#if (!defined(&Embperl::Init))
- {
- bootstrap Embperl $VERSION;
- Boot ($VERSION) ;
- Init (defined(&Apache::server)?Apache -> server:undef, undef) ;
- }
-
-
-sub import
- {
- ApacheAddModule () if ($ENV{MOD_PERL}) ;
- }
+bootstrap Embperl $VERSION;
+Boot ($VERSION) ;
+Init (defined(&Apache::server)?Apache -> server:undef, undef) ;
$cwd = Cwd::fastcwd();
1.1.2.24 +6 -5 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- epapinit.c 1 Mar 2002 19:59:23 -0000 1.1.2.23
+++ epapinit.c 1 Mar 2002 21:42:46 -0000 1.1.2.24
@@ -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.23 2002/03/01 19:59:23 richter Exp $
+# $Id: epapinit.c,v 1.1.2.24 2002/03/01 21:42:46 richter Exp $
#
###################################################################################*/
@@ -120,11 +120,12 @@
void embperl_ApacheAddModule ()
{
- fprintf (stderr, "embperl_ApacheAddModule\n") ;
- if (!ap_find_linked_module(__FILE__ /*'epapinit.c'*/))
+ if (!ap_find_linked_module("embperl.c"))
{
- fprintf (stderr, "ap_add_module\n") ;
- ap_add_module (&embperl_module) ;
+ embperl_module.name = "embperl.c" ;
+ ap_add_loaded_module (&embperl_module) ;
+ /* avoid warning when using AddModule */
+ ap_remove_module (&embperl_module) ;
}
}
No revision
No revision
1.24.4.46 +5 -3 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.45
retrieving revision 1.24.4.46
diff -u -r1.24.4.45 -r1.24.4.46
--- httpd.conf.src 1 Mar 2002 20:09:13 -0000 1.24.4.45
+++ httpd.conf.src 1 Mar 2002 21:42:46 -0000 1.24.4.46
@@ -127,9 +127,11 @@
PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
-#PerlModule Embperl
+PerlModule Embperl
+AddModule embperl.c
-#Embperl_UseEnv on
+
+Embperl_UseEnv on
<Location /embperl/log>
@@ -470,7 +472,7 @@
<Location /embperl/SSI/>
-PerlSetEnv EMBPERL_SYNTAX SSI
+EMBPERL_SYNTAX SSI
</Location>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
