richter 01/12/03 23:43:16
Modified: . Embperl.pod EmbperlD.pod INSTALL.pod MANIFEST
Makefile.PL epmain.c epnames.h test.pl
test/cmp errpage.htm
test/conf httpd.conf.src
Added: . Embperl_BS
test/cmp nooutput.htm
test/html crypto.htm nooutput.htm
Log:
cleanup
Revision Changes Path
1.78 +1 -1 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Embperl.pod 2001/11/02 11:06:43 1.77
+++ Embperl.pod 2001/12/04 07:43:15 1.78
@@ -889,7 +889,7 @@
Example:
open F, "filename" ;
- local $\ = undef ;
+ local $/ = undef ;
$$in = <F> ;
close F ;
1.50 +1 -1 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- EmbperlD.pod 2001/11/02 11:06:43 1.49
+++ EmbperlD.pod 2001/12/04 07:43:15 1.50
@@ -833,7 +833,7 @@
Beispiel:
open F, "filename" ;
- local $\ = undef ;
+ local $/ = undef ;
$$in = <F> ;
close F ;
1.22 +3 -0 embperl/INSTALL.pod
Index: INSTALL.pod
===================================================================
RCS file: /home/cvs/embperl/INSTALL.pod,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- INSTALL.pod 2001/11/02 04:23:36 1.21
+++ INSTALL.pod 2001/12/04 07:43:15 1.22
@@ -235,6 +235,9 @@
You can skip the installation of Apache and mod_perl, if you only want
to use Embperl offline or as CGI.
+
+apache_1.3.22-win32-x86.msi
+
Next get the Apache binary (including the source e.g.
apache_1.3.19-win32-src-r2.msi) from
http://www.apache.org/dist/httpd/binaries/win32/ . (You may need to install the
windows MSI installer from the same page too). Now run the installation.
1.72 +3 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- MANIFEST 2001/11/02 11:06:43 1.71
+++ MANIFEST 2001/12/04 07:43:15 1.72
@@ -66,6 +66,7 @@
epapinit.c
test.pl
test/html/ascii
+test/html/nooutput.htm
test/html/binary.htm
test/html/pure.htm
test/html/plain.htm
@@ -202,6 +203,7 @@
test/html/inctext.htm
test/html/SSIEP/ssiep.htm
test/cmp/ascii
+test/cmp/nooutput.htm
test/cmp/binary.htm
test/cmp/pure.htm
test/cmp/plain.htm
@@ -319,4 +321,5 @@
Embperl/Session.pm
Embperl/Mail.pm
EmbperlLogo.gif
+Embperl_BS
1.55 +31 -7 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.PL 2001/11/02 11:06:43 1.54
+++ Makefile.PL 2001/12/04 07:43:15 1.55
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.54 2001/11/02 11:06:43 richter Exp $
+# $Id: Makefile.PL,v 1.55 2001/12/04 07:43:15 richter Exp $
#
@@ -134,7 +134,13 @@
testgdbb : testdbbreak
\tPERL_DL_NONLAZY=0 gdb -x dbinitembperl \$(FULLPERL)
+start : pure_all
+\tPERL_DL_NONLAZY=0 \$(FULLPERL) -I\$(INST_ARCHLIB) -I\$(INST_LIB)
-I\$(PERL_ARCHLIB) -I\$(PERL_LIB) \$(TEST_FILE) --start -m \$(TESTARGS)
+stop : pure_all
+\tPERL_DL_NONLAZY=0 \$(FULLPERL) -I\$(INST_ARCHLIB) -I\$(INST_LIB)
-I\$(PERL_ARCHLIB) -I\$(PERL_LIB) \$(TEST_FILE) --kill -m \$(TESTARGS)
+
+
} ;
$txt =~ s/\r\n/\n/g ; # make doesn't like \r\n!
@@ -209,18 +215,22 @@
return $txt ;
}
+$MY::cccmd_seen = 0 ;
sub MY::const_cccmd
{
my $self = shift ;
my $txt = $self -> MM::const_cccmd (@_) ;
- my $txt2 = $txt ;
+ return $txt if ($MY::cccmd_seen++) ;
+
+ my $txt2 = $txt ;
$txt2 =~ s/\$\(CC\)/\$(CPP)/ ;
$txt2 =~ s/CCCMD/CPPCMD/ ;
-
- return "$txt\n\n$txt2" ;
+
+ return "$txt\n\n$txt2" ;
}
+
sub MY::post_initialize
{
@@ -434,6 +444,8 @@
$ccdebug = '' ;
$lddebug = '' ;
+$libs = '' ;
+$d = '' ;
if ($ARGV[0] eq 'debug')
{
@@ -450,6 +462,19 @@
}
}
+if ($ARGV[0] eq 'dmalloc')
+ {
+ shift @ARGV;
+ if ($win32)
+ {
+ }
+ else
+ {
+ $libs .= '-L/usr/local/lib -ldmalloc' ;
+ $d .= '-DDMALLOC' ;
+ }
+ }
+
if (defined ($ARGV[0]) && ($ARGV[0] =~ /^\W/))
{
$apache = 2 ;
@@ -626,7 +651,7 @@
$i = "-I$inc_dir -I$apache_src/regex -I$apache_src/os/unix" ;
$o = '' ;
}
- $d = "-DAPACHE" ;
+ $d .= ' -DAPACHE' ;
$EPNOAPACHELIB = 0 ;
}
else
@@ -641,7 +666,6 @@
print "Will build without mod_perl support\n" ;
$i = '' ;
- $d = '' ;
$o = '' ;
}
@@ -1122,7 +1146,7 @@
'NAME' => 'HTML::Embperl',
'VERSION_FROM' => 'Embperl.pm', # finds $VERSION
'OBJECT' => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT)
epchar$(OBJ_EXT) epcmd$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epapinit$(OBJ_EXT)
' .
- ($EP2?'epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT)
epcomp$(OBJ_EXT)':'') . $o,
+ ($EP2?'epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT)
epcomp$(OBJ_EXT) epcache$(OBJ_EXT) epprovider$(OBJ_EXT)':'') . $o,
'LIBS' => [$libs || ''],
'DEFINE' => "$d \$(DEFS)",
'INC' => $i,
1.117 +3 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- epmain.c 2001/11/02 10:15:22 1.116
+++ epmain.c 2001/12/04 07:43:15 1.117
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.116 2001/11/02 10:15:22 richter Exp $
+# $Id: epmain.c,v 1.117 2001/12/04 07:43:15 richter Exp $
#
###################################################################################*/
@@ -2584,7 +2584,8 @@
sv_magic (pReqHV, NULL, '~', (char *)&pCurrReq, sizeof (pCurrReq)) ;
}
- _free (r, r -> sSessionID) ;
+ if (r -> sSessionID)
+ _free (r, r -> sSessionID) ;
r -> pNext = pReqFree ;
pReqFree = r ;
}
1.30 +2 -2 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- epnames.h 2001/07/09 05:58:26 1.29
+++ epnames.h 2001/12/04 07:43:15 1.30
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.29 2001/07/09 05:58:26 richter Exp $
+# $Id: epnames.h,v 1.30 2001/12/04 07:43:15 richter Exp $
#
###################################################################################*/
@@ -195,7 +195,7 @@
#define xNoName EMBPERL_xNoName
#define xOrderIndexAttr EMBPERL_xOrderIndexAttr
#define Escape EMBPERL_Escape
-
+#define GetSessionID EMBPERL_GetSessionID
#ifndef PERL_VERSION
#include <patchlevel.h>
1.117 +210 -30 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- test.pl 2001/09/13 07:28:47 1.116
+++ test.pl 2001/12/04 07:43:15 1.117
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.116 2001/09/13 07:28:47 richter Exp $
+# $Id: test.pl,v 1.117 2001/12/04 07:43:15 richter Exp $
#
###################################################################################
@@ -35,12 +35,20 @@
# param =>
# reqbody =>
# respheader => \%
+# recipe =>
+# xsltstylesheet =>
+# syntax =>
+# msg =>
@testdata = (
'ascii' => { },
'pure.htm' => {
# 'noloop' => 1,
},
+ 'nooutput.htm' => {
+ repeat => 2,
+ version => 2,
+ },
'plain.htm' => {
repeat => 3,
},
@@ -118,6 +126,21 @@
'errors' => -1,
'noloop' => 1,
'condition' => '$] < 5.006000',
+ offline => 1,
+ },
+ 'varerr.htm' => {
+ 'errors' => -1,
+ 'noloop' => 1,
+ 'condition' => '$] < 5.006000',
+ cgi => 1,
+ 'version' => 1,
+ },
+ 'varerr.htm' => {
+ 'errors' => -1,
+ 'noloop' => 1,
+ 'condition' => '$] < 5.006000',
+ modperl => 1,
+ 'version' => 1,
},
'varerr.htm' => {
'errors' => 7,
@@ -236,6 +259,8 @@
'rawinput/include.htm' => {
'option' => '16',
'version' => 2,
+ 'cgi' => 0,
+ 'repeat' => 2,
},
'includeerr1.htm' => {
'errors' => '1',
@@ -293,6 +318,7 @@
'importmodule.htm' => {
},
'recursexec.htm' => {
+ 'version' => 1,
},
'nph/div.htm' => {
'option' => '64',
@@ -624,10 +650,12 @@
'SSI/ssibasic.htm' => {
'version' => 2,
'syntax' => 'SSI',
+ 'cgi' => 0,
},
'SSIEP/ssiep.htm' => {
'version' => 2,
'syntax' => 'Embperl SSI',
+ 'cgi' => 0,
},
'inctext.htm' => {
'ep1compat' => 0,
@@ -643,6 +671,9 @@
'version' => 2,
'repeat' => 2,
},
+ 'tagintag.htm' => {
+ 'version' => 2,
+ },
'rtf/rtfbasic.asc' => {
'version' => 2,
'syntax' => 'RTF',
@@ -696,6 +727,150 @@
'crypto.htm' => {
'condition' => '$EPC_ENABLE',
},
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ #'condition' => '!$EPWIN32',
+ 'cgi' => 0,
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'EmbperlLibXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' embperl -> libxslt',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'EmbperlXalanXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'condition' => '$XALANPATH',
+ 'cmpext' => '.xalan',
+ 'msg' => ' embperl -> xalan',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'EmbperlXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'xsltproc' => 'libxslt',
+ 'offline' => 1,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' embperl -> xslt (libxslt)',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'EmbperlXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'xsltproc' => 'xalan',
+ 'condition' => '$XALANPATH',
+ 'cmpext' => '.xalan',
+ 'msg' => ' embperl -> xslt (xalan)',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'LibXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' libxslt',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'XalanXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'condition' => '$XALANPATH',
+ 'cmpext' => '.xalan',
+ 'msg' => ' xalan',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'XSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'xsltproc' => 'libxslt',
+ 'offline' => 1,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' xslt (libxslt)',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'XSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'offline' => 1,
+ 'xsltproc' => 'xalan',
+ 'condition' => '$XALANPATH',
+ 'cmpext' => '.xalan',
+ 'msg' => ' xslt (xalan)',
+ },
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ 'recipe' => 'EmbperlLibXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'cmpext' => '.htm',
+ 'offline' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ 'recipe' => 'EmbperlXalanXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'cmpext' => '.xalan.htm',
+ 'offline' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'libxslt/pod.xml' => {
+ 'version' => 2,
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'xalan/pod.xml' => {
+ 'version' => 2,
+ 'cmpext' => '.xalan',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'asclibxslt/pod.asc' => {
+ 'version' => 2,
+ 'cmpext' => '.htm',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'ascxalan/pod.asc' => {
+ 'version' => 2,
+ 'cmpext' => '.xalan.htm',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH',
+ },
+ 'incxmlLibXSLT.htm' => {
+ 'version' => 2,
+ 'condition' => '$LIBXSLTVERSION',
+ 'msg' => ' libxslt',
+ },
+# 'incxmlLibXSLT2.htm' => {
+# 'version' => 2,
+# 'condition' => '$LIBXSLTVERSION',
+# 'msg' => ' libxslt',
+# },
+ 'incxmlXalanXSLT.htm' => {
+ 'version' => 2,
+ 'condition' => '$XALANPATH',
+ 'msg' => ' xalan',
+ },
) ;
for ($i = 0 ; $i < @testdata; $i += 2)
@@ -710,7 +885,7 @@
use vars qw ($httpconfsrc $httpconf $EPPORT $EPPORT2 *SAVEERR *ERR $EPHTTPDDLL
$EPSTARTUP $EPDEBUG
$testshare
- $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EP1COMPAT
$EPAPACHEVERSION $EPC_ENABLE
+ $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EPSESSIONXVERSION
$EP1COMPAT $EPAPACHEVERSION $EPC_ENABLE
$opt_offline $opt_ep1 $opt_cgi $opt_modperl $opt_execute $opt_nokill
$opt_loop
$opt_multchild $opt_memcheck $opt_exitonmem $opt_exitonsv $opt_config
$opt_nostart $opt_uniquefn
$opt_quite $opt_qq $opt_ignoreerror $opt_tests $opt_blib $opt_help
$opt_dbgbreak $opt_finderr
@@ -766,7 +941,7 @@
print "\nloading... ";
- $defaultdebug = 0x7fc5ffd ;
+ $defaultdebug = 0x7fffdffd ;
#$defaultdebug = 1 ;
#### setup paths #####
@@ -779,6 +954,8 @@
$ENV{EMBPERL_LOG} = $logfile ;
$ENV{EMBPERL_DEBUG} = $defaultdebug ;
+ $ENV{DMALLOC_OPTIONS} = "log=$tmppath/dmalloc.log,debug=0x3f03" ;
+ $ENV{EMBPERL_SESSION_HANDLER_CLASS} = 'no' if (!$EPSESSIONXVERSION) ;
unlink ($logfile) ;
}
@@ -1090,24 +1267,16 @@
{
my ($loc, $file, $query, $ofile, $content, $upload, $cookieaction, $respheader)
= @_ ;
-
- eval 'require LWP::UserAgent' ;
-
- $cookieaction |= '' ;
-
- if ($@)
- {
- return "LWP not installed\n" ;
- }
- eval 'use HTTP::Request::Common' ;
- if ($@)
- {
- return "HTTP::Request::Common not installed\n" ;
- }
-
+ eval 'require LWP::UserAgent' ;
+ return "LWP not installed\n" if ($@) ;
+ eval 'use HTTP::Request::Common' ;
+ return "HTTP::Request::Common not installed\n" if ($@) ;
+ eval 'require URI::URL';
+ return "URI::URL not installed\n" if ($@) ;
- $query ||= '' ;
+ $query ||= '' ;
+ $cookieaction ||= '' ;
my $ua = new LWP::UserAgent; # create a useragent to test
@@ -1372,7 +1541,7 @@
}
-$opt_modperl = $opt_cgi = $opt_offline = $opt_execute = $opt_cache = 0 if
($opt_start || $opt_startinter || $opt_kill) ;
+$opt_ep1 = $opt_modperl = $opt_cgi = $opt_offline = $opt_execute = $opt_cache = 0
if ($opt_start || $opt_startinter || $opt_kill) ;
$opt_nokill = 1 if ($opt_nostart || $opt_start || $opt_startinter) ;
$looptest = defined ($opt_loop)?1:0 ; # endless loop tests
@@ -1457,7 +1626,7 @@
$cp -> deny (':base_loop') ;
$cp -> share ('$testshare') ;
-$ENV{EMBPERL_ALLOW} = 'asc|\\.htm$|\\.htm-1$' ;
+$ENV{EMBPERL_ALLOW} = 'asc|\\.xml$|\\.htm$|\\.htm-1$' ;
#HTML::Embperl::log ("Start testing...\n") ; # force logfile open
@@ -1539,6 +1708,12 @@
$ENV{EMBPERL_OPTIONS} = $test -> {option} if (defined ($test ->
{option})) ;
delete $ENV{EMBPERL_SYNTAX} ;
$ENV{EMBPERL_SYNTAX} = $test -> {syntax} if (defined ($test ->
{syntax})) ;
+ delete $ENV{EMBPERL_RECIPE} ;
+ $ENV{EMBPERL_RECIPE} = $test -> {recipe} if (defined ($test ->
{recipe})) ;
+ delete $ENV{EMBPERL_XSLTSTYLESHEET} ;
+ $ENV{EMBPERL_XSLTSTYLESHEET} = $test -> {xsltstylesheet} if
(defined ($test -> {xsltstylesheet})) ;
+ delete $ENV{EMBPERL_XSLTPROC} ;
+ $ENV{EMBPERL_XSLTPROC} = $test -> {xsltproc} if (defined ($test ->
{xsltproc})) ;
delete $ENV{EMBPERL_COMPARTMENT} if (defined
($ENV{EMBPERL_COMPARTMENT})) ;
$ENV{EMBPERL_COMPARTMENT} = $test -> {compartment} if (defined ($test
-> {compartment})) ;
delete $ENV{EMBPERL_PACKAGE} if (defined (delete
$ENV{EMBPERL_PACKAGE})) ;
@@ -1550,7 +1725,7 @@
$page, $test -> {query_info} || '') ;
unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ;
- $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug
":"") . '...' ;
+ $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug
":"") . ($test->{msg} || '') . '...' ;
$txt .= ' ' x (30 - length ($txt)) ;
print $txt ;
@@ -1653,7 +1828,7 @@
unlink ($outfile) ;
$t1 = HTML::Embperl::Clock () ;
- $err = HTML::Embperl::Execute ({'input' => \$indata,
+ $err = HTML::Embperl::Execute ({'input' => \$indata,
'inputfile' => 'i1',
'mtime' => 1,
'outputfile' => $outfile,
@@ -1784,9 +1959,9 @@
$err = CheckError ($EP2?6:8) if ($err == 0) ;
- if (@errors != ($EP2?2:12))
+ if (@errors != ($EP2?5:12))
{
- print "\n\n\@errors does not return correct number of errors
(is " . scalar(@errors) . ", should 2)\n" ;
+ print "\n\n\@errors does not return correct number of errors
(is " . scalar(@errors) . ", should 5)\n" ;
$err = 1 ;
}
@@ -1797,7 +1972,11 @@
print "ok\n" unless ($err) ;
}
- foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm')
+ foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm',
+ 'EmbperlObject/sub/epobless.htm',
'EmbperlObject/sub/epobless.htm',
+ #'EmbperlObject/sub/epobless2.htm',
'EmbperlObject/sub/epobless2.htm',
+ #'EmbperlObject/sub/epobless3.htm',
'EmbperlObject/sub/epobless3.htm',
+ )
{
if ($err == 0 || $opt_ignoreerror) # && $version == 1)
{
@@ -2130,7 +2309,7 @@
sleep (7) ;
if (!open FH, "$tmppath/httpd.pid")
{
- sleep (7) ;
+ sleep (($opt_gdb || $opt_ddd)?15:7) ;
if (!open FH, "$tmppath/httpd.pid")
{
open (FERR, "$httpderr") ;
@@ -2198,13 +2377,13 @@
}
- next if ($file eq 'chdir.htm' && $EPWIN32) ;
+ #next if ($file eq 'chdir.htm' && $EPWIN32) ;
next if ($file eq 'notfound.htm' && $loc eq $cgiloc && $EPWIN32) ;
next if ($file =~ /opmask/ && $EPSTARTUP =~ /_dso/) ;
if ($file =~ /sess\.htm/)
{
next if ($loc eq $cgiloc && $EPSESSIONCLASS ne 'Embperl') ;
- if (!$EPSESSIONVERSION)
+ if (!$EPSESSIONXVERSION)
{
$txt2 = "$file...";
$txt2 .= ' ' x (29 - length ($txt2)) ;
@@ -2332,7 +2511,8 @@
if ($opt_cgi && $err == 0 && $loc ne $cgiloc && $loopcnt == 0)
{
- $loc = $EP2?'':$cgiloc ; # currently disable cgi mode at all for Embperl
2.x
+ #$loc = $EP2?'':$cgiloc ; # currently disable cgi mode at all for Embperl
2.x
+ $loc = $cgiloc ;
}
else
{
1.2 +13 -0 embperl/Embperl_BS
1.9 +1 -0 embperl/test/cmp/errpage.htm
Index: errpage.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/errpage.htm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- errpage.htm 2001/11/02 10:03:49 1.8
+++ errpage.htm 2001/12/04 07:43:16 1.9
@@ -76,6 +76,7 @@
^Date
^Server
^Connection
+^^Transfer-Encoding
^Content-Type: text/html
^^<!DOCTYPE
1.2 +11 -0 embperl/test/cmp/nooutput.htm
1.45 +11 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- httpd.conf.src 2001/09/01 21:31:10 1.44
+++ httpd.conf.src 2001/12/04 07:43:16 1.45
@@ -63,6 +63,8 @@
print OFH "SetEnv EMBPERL_ESCMODE 3\n" ;
}
+if ($EPSESSIONXVERSION)
+ {
if ($EPSESSIONVERSION)
{
print OFH <<EOD ;
@@ -96,6 +98,15 @@
PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
SetEnv EMBPERL_SESSION_CLASSES "File Null"
SetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
+EOD
+ }
+ }
+else
+ {
+print OFH <<EOD ;
+
+SetEnv EMBPERL_SESSION_HANDLER_CLASS "no"
+PerlSetEnv EMBPERL_SESSION_HANDLER_CLASS "no"
EOD
}
1.1 embperl/test/html/crypto.htm
<<Binary file>>
1.2 +16 -0 embperl/test/html/nooutput.htm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
