You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/05/22 13:20:11 UTC
cvs commit: embperl/test/html execnotfound.htm
richter 01/05/22 04:20:09
Modified: . Changes.pod Embperl.xs MANIFEST epmain.c test.pl
Added: test/cmp execnotfound.htm
test/html execnotfound.htm
Log:
Make -> Error setable
Revision Changes Path
1.168 +2 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- Changes.pod 2001/05/18 08:32:05 1.167
+++ Changes.pod 2001/05/22 11:19:45 1.168
@@ -10,7 +10,8 @@
session management. Spotted by Lukas Zapletal and Andy Lim.
- Improved Makefile.PL to catche more setup situation on
Win 32.
-
+ - Make $r -> Error settable to be able to reset Embperl's
+ internal error flag.
=head1 1.3.2 (RELEASE) 16 May. 2001
1.45 +3 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Embperl.xs 2001/05/18 08:32:08 1.44
+++ Embperl.xs 2001/05/22 11:19:48 1.45
@@ -558,10 +558,12 @@
RETVAL
int
-embperl_Error(r)
+embperl_Error(r,...)
tReq * r
CODE:
RETVAL = r -> bError ;
+ if (items > 1)
+ r -> bError = (int)SvIV(ST(1)) ;
OUTPUT:
RETVAL
1.68 +2 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- MANIFEST 2001/05/15 04:50:06 1.67
+++ MANIFEST 2001/05/22 11:19:49 1.68
@@ -72,6 +72,7 @@
test/html/errdoc/epl/errdoc2.htm
test/html/errmsg.htm
test/html/errmsg2.htm
+test/html/execnotfound.htm
test/html/escape.htm
test/html/escraw.htm
test/html/spaces.htm
@@ -291,6 +292,7 @@
test/cmp/setbadsess.htm
test/cmp/setunknownsess.htm
test/cmp/inctext.htm
+test/cmp/execnotfound.htm
test/conf/httpd.conf.src
test/conf/startup.pl
test/conf/startup_dso.pl
1.101 +12 -4 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- epmain.c 2001/05/11 04:06:51 1.100
+++ epmain.c 2001/05/22 11:19:49 1.101
@@ -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.100 2001/05/11 04:06:51 richter Exp $
+# $Id: epmain.c,v 1.101 2001/05/22 11:19:49 richter Exp $
#
###################################################################################*/
@@ -1892,6 +1892,11 @@
SvREFCNT_dec (f -> pExportHash) ;
f -> pExportHash = NULL ;
}
+ if (f -> pBufSV)
+ {
+ SvREFCNT_dec (f -> pBufSV) ;
+ f -> pBufSV = NULL ;
+ }
}
pNew = "Found" ;
}
@@ -2353,9 +2358,12 @@
{
tReq * l = r -> pLastReq ;
- l -> bError = r -> bError ;
- l -> nLastErrFill= r -> nLastErrFill ;
- l -> bLastErrState= r -> bLastErrState ;
+ if (!(r -> bOptions & optReturnError))
+ {
+ l -> bError = r -> bError ;
+ l -> nLastErrFill= r -> nLastErrFill ;
+ l -> bLastErrState= r -> bLastErrState ;
+ }
}
else
{
1.108 +9 -6 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- test.pl 2001/05/15 10:41:27 1.107
+++ test.pl 2001/05/22 11:19:52 1.108
@@ -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.107 2001/05/15 10:41:27 richter Exp $
+# $Id: test.pl,v 1.108 2001/05/22 11:19:52 richter Exp $
#
###################################################################################
@@ -71,6 +71,9 @@
'notfound.htm' => {
'errors' => '1',
},
+ 'execnotfound.htm' => {
+ 'errors' => '1',
+ },
'notallow.xhtm' => {
'errors' => '1',
},
@@ -219,7 +222,7 @@
'upload.htm' => {
'query_info' => 'multval=A&multval=B&multval=C&single=S',
'offline' => 0,
-# 'noloop' => 1,
+ 'noloop' => 1,
'reqbody' => "Hi there!",
},
'reqrec.htm' => {
@@ -525,7 +528,6 @@
},
'EmbperlObject/sub/eponotfound.htm' => {
'offline' => 0,
- 'cgi' => 0,
},
'EmbperlObject/sub/epobless.htm' => {
'offline' => 0,
@@ -591,7 +593,7 @@
'version' => 2,
'syntax' => 'RTF',
'offline' => 1,
- 'param' => { one => 1, hash => { a => 111, b => 222, c => [1111,2222,3333,4444]}, array => [11,22,33] },
+ 'param' => { one => 1, hash => { a => 111, b => 222, c => [1111,2222,3333,4444]}, array => [11,22,33], uml => '���', brace => 'open { close } end' },
},
'rtf/rtffull.asc' => {
'version' => 2,
@@ -1915,8 +1917,9 @@
if ($EPWIN32)
{
- $ENV{PATH} .= ";$EPHTTPDDLL" if ($EPWIN32) ;
- $ENV{PERL_STARTUP_DONE} = 1 ;
+ #$ENV{PATH} .= ";$EPHTTPDDLL;$EPHTTPDDLL\\..\\os\\win32\\release;$EPHTTPDDLL\\..\\os\\win32\\debug" if ($EPWIN32) ;
+
+ $ENV{PERL_STARTUP_DONE} = 1 ;
$EPAPACHEVERSION =~ m#Apache/1\.3\.(\d+) # ;
1.1 embperl/test/cmp/execnotfound.htm
Index: execnotfound.htm
===================================================================
<html>
<head>
<title>Tests for Embperl - Execute non exitent file</title>
</head>
<body>
rc = 404<br>
<p>Done.</p>
</body></html>
1.1 embperl/test/html/execnotfound.htm
Index: execnotfound.htm
===================================================================
<html>
<head>
<title>Tests for Embperl - Execute non exitent file</title>
</head>
<body>
[-
$r = shift ;
my $err = $r -> Error ;
$rc = Execute { inputfile => 'notfound.htm', options => 262144 } ;
$r -> Error ($err) ;
-]
rc = [+ $rc +]<br>
<p>Done.</p>
</body></html>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org