richter 01/09/18 22:38:30
Modified: . Tag: Embperl2c Embperl.pod EmbperlD.pod test.pl
Log:
test cleanup
Revision Changes Path
No revision
No revision
1.56.4.10 +1 -1 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.56.4.9
retrieving revision 1.56.4.10
diff -u -r1.56.4.9 -r1.56.4.10
--- Embperl.pod 2001/09/14 11:06:25 1.56.4.9
+++ Embperl.pod 2001/09/19 05:38:29 1.56.4.10
@@ -503,7 +503,7 @@
=head2 EMBPERL_FILESMATCH
-If specified, only files which match the given B<perl regular expression> will be
+If specified, only files where the uri match the given B<perl regular expression>
will be
processed by Embperl, all other files will be handled by the standard Apache
handler. This can be useful if you have Embperl documents and non Embperl
documents (e.g. gifs) residing in the same directory. EMBPERL_FILESMATCH works only
1.29.4.9 +2 -2 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.29.4.8
retrieving revision 1.29.4.9
diff -u -r1.29.4.8 -r1.29.4.9
--- EmbperlD.pod 2001/09/13 07:29:43 1.29.4.8
+++ EmbperlD.pod 2001/09/19 05:38:29 1.29.4.9
@@ -453,8 +453,8 @@
=head2 EMBPERL_FILESMATCH
-Wenn vorhanden, werden von I<Embperl> nur Dateien bearbeitet, die der angegebenen
-B<Perl regular expression> entsprechen. Alle anderen Dateien werden an den Standard
+Wenn vorhanden, werden von I<Embperl> nur Dateien bearbeitet, deren URI der
angegebenen
+B<Perl regular expression> entspricht. Alle anderen Dateien werden an den Standard
Apachehandler weitergereicht. Dies ist n�tztlich, um Embperl Dokumente und
Nicht-Embperl
Dokumente (z.B. Gifs) in einem Verzeichnis abzulegen.
EMBPERL_FILESMATCH funktioniert nur unter I<mod_perl>. Beispiel:
1.70.4.73 +16 -16 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.72
retrieving revision 1.70.4.73
diff -u -r1.70.4.72 -r1.70.4.73
--- test.pl 2001/09/18 18:01:45 1.70.4.72
+++ test.pl 2001/09/19 05:38:29 1.70.4.73
@@ -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.70.4.72 2001/09/18 18:01:45 richter Exp $
+# $Id: test.pl,v 1.70.4.73 2001/09/19 05:38:29 richter Exp $
#
###################################################################################
@@ -346,7 +346,6 @@
'query_info' => 'a=1&b=2',
'option' => '384',
'cgi' => 0,
- 'condition' => '!$EPWIN32',
},
'match/div.htm' => {
'offline' => 0,
@@ -626,10 +625,12 @@
'SSI/ssibasic.htm' => {
'version' => 2,
'syntax' => 'SSI',
+ 'cgi' => 0,
},
'SSIEP/ssiep.htm' => {
'version' => 2,
'syntax' => 'Embperl SSI',
+ 'cgi' => 0,
},
'inctext.htm' => {
'ep1compat' => 0,
@@ -698,10 +699,10 @@
'crypto.htm' => {
'condition' => '$EPC_ENABLE',
},
- 'pod/pod.asc' => {
- 'version' => 2,
- 'syntax' => 'POD',
- },
+# 'pod/pod.asc' => {
+# 'version' => 2,
+# 'syntax' => 'POD',
+# },
) ;
for ($i = 0 ; $i < @testdata; $i += 2)
@@ -714,9 +715,9 @@
# avoid some warnings:
-use vars qw ($httpconfsrc $httpconf $EPPORT $EPPORT2 *SAVEERR *ERR $EPHTTPDDLL
$EPSTARTUP $EPDEBUG $EPMODPERLVERSION
+use vars qw ($httpconfsrc $httpconf $EPPORT $EPPORT2 *SAVEERR *ERR $EPHTTPDDLL
$EPSTARTUP $EPDEBUG
$testshare
- $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EP1COMPAT
$EPAPACHEVERSION $EPC_ENABLE $EPSESSIONXVERSION
+ $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $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
@@ -765,7 +766,7 @@
}
else
{
- system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPMODPERLVERSION)
;
+ system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPHTTPD ne '') ;
}
} ;
@@ -785,7 +786,6 @@
$ENV{EMBPERL_LOG} = $logfile ;
$ENV{EMBPERL_DEBUG} = $defaultdebug ;
- $ENV{EMBPERL_SESSION_HANDLER_CLASS} = 'no' ; # no session handling in offline
mode
unlink ($logfile) ;
}
@@ -793,7 +793,7 @@
END
{
print "\nTest terminated with fatal error\n" if ($fatal) ;
- system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPMODPERLVERSION &&
!$opt_nokill && !$EPWIN32) ;
+ system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPHTTPD ne '' &&
!$opt_nokill && !$EPWIN32) ;
$? = $fatal || $err ;
}
@@ -827,7 +827,7 @@
$EPSESSIONCLASS = $ENV{EMBPERL_SESSION_CLASS} || (($EPSESSIONVERSION =~
/^0\.17/)?'Win32':'0') || ($EPSESSIONVERSION >= 1.00?'Embperl':'0') ;
$EPSESSIONDS = $ENV{EMBPERL_SESSION_DS} || 'dbi:mysql:session' ;
-die "You must install libwin32 first" if ($EPWIN32 && $win32loaderr &&
$EPMODPERLVERSION) ;
+die "You must install libwin32 first" if ($EPWIN32 && $win32loaderr && $EPHTTPD) ;
#### setup files ####
@@ -1371,7 +1371,7 @@
{
$opt_modperl = 1 ;
}
- elsif ($EPMODPERLVERSION)
+ elsif ($EPHTTPD ne '')
{ $opt_cache = $opt_modperl = $opt_cgi = $opt_offline = $opt_execute = 1 }
else
{ $opt_cache = $opt_offline = $opt_execute = 1 }
@@ -2159,7 +2159,7 @@
$httpduid = getpwnam ($EPUSER) if (!$EPWIN32) ;
}
- elsif ($err == 0 && !$EPMODPERLVERSION)
+ elsif ($err == 0 && $EPHTTPD eq '')
{
print "\n\nSkiping tests for mod_perl, because Embperl is not build for it.\n"
;
print "Embperl can still be used as CGI-script, but 'make test' cannot test
it\n" ;
@@ -2211,7 +2211,7 @@
if ($file =~ /sess\.htm/)
{
next if ($loc eq $cgiloc && $EPSESSIONCLASS ne 'Embperl') ;
- if (!$EPSESSIONXVERSION)
+ if (!$EPSESSIONVERSION)
{
$txt2 = "$file...";
$txt2 .= ' ' x (29 - length ($txt2)) ;
@@ -2398,7 +2398,7 @@
}
else
{
- system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPMODPERLVERSION &&
!$opt_nokill) ;
+ system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPHTTPD ne '' &&
!$opt_nokill) ;
}
exit ($err) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
