richter 00/11/13 00:58:30
Modified: . Makefile.PL epnames.h
test/conf httpd.conf.src
Log:
PerlSet EMBPERL_OPTIONS 0 only for mod_perl 1.24+
Revision Changes Path
1.38 +3 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.PL 2000/11/13 05:43:54 1.37
+++ Makefile.PL 2000/11/13 08:58:29 1.38
@@ -609,7 +609,8 @@
@EPAPACHEVERSION = start ("$EPHTTPD -v") ;
@modules = start ("$EPHTTPD -l") ;
- print "Apache Version $EPAPACHEVERSION[0]" ;
+ chomp ($EPAPACHEVERSION[0]) ;
+ print "Apache Version $EPAPACHEVERSION[0]\n" ;
$EPSTRONGHOLD = ($EPAPACHEVERSION[0] =~ /stronghold/i) ;
$EPAPACHE_SSL = grep (/apache_ssl.c/, @modules) ;
@@ -799,6 +800,7 @@
print FH "\$EPAPACHEVERSION='$EPAPACHEVERSION[0]';\n" ;
print FH "\$EPSESSIONVERSION='$SessVer';\n" ;
print FH "\$EP2='$EP2';\n" ;
+ print FH "\$EPMODPERLVERSION='$MPVer';\n" ;
if ($win32)
{
print FH "\$EPNULL='nul';\n" ;
1.21 +2 -0 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- epnames.h 2000/10/17 08:23:05 1.20
+++ epnames.h 2000/11/13 08:58:29 1.21
@@ -69,6 +69,8 @@
#define EvalTransFlags EMBPERL_EvalTransFlags
#define EvalTransOnFirstCall EMBPERL_EvalTransOnFirstCall
#define EvalSub EMBPERL_EvalSub
+#define EvalOnly EMBPERL_EvalOnly
+#define CallCV EMBPERL_CallCV
#define GetContentLength EMBPERL_GetContentLength
#define GetLogFilePos EMBPERL_GetLogFilePos
#define ReadHTML EMBPERL_ReadHTML
1.28 +6 -1 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- httpd.conf.src 2000/11/13 05:43:54 1.27
+++ httpd.conf.src 2000/11/13 08:58:29 1.28
@@ -25,6 +25,8 @@
EOD
}
+
+
print OFH <<EOD ;
$EPMODPERL
@@ -41,11 +43,14 @@
SetEnv EMBPERL_DEBUG $EPDEBUG
-SetEnv EMBPERL_OPTIONS 0
SetEnv EMBPERL_VIRTLOG /embperl/log
PerlSetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
EOD
+
+print OFH "SetEnv EMBPERL_OPTIONS 0\n" if ($EPMODPERLVERSION >= 1.24) ;
+
+
if ($EPSESSIONVERSION)
{
print OFH <<EOD ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
