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 2002/02/06 19:22:33 UTC
cvs commit: embperl/test/conf httpd.conf.src
richter 02/02/06 10:22:33
Modified: . Tag: Embperl2c epcomp.c eputil.c
Embperl Tag: Embperl2c Constant.pm Object.pm
test/cmp Tag: Embperl2c epobase.htm
test/conf Tag: Embperl2c httpd.conf.src
Log:
eo
Revision Changes Path
No revision
No revision
1.4.2.93 +2 -1 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.92
retrieving revision 1.4.2.93
diff -u -r1.4.2.92 -r1.4.2.93
--- epcomp.c 5 Feb 2002 09:04:03 -0000 1.4.2.92
+++ epcomp.c 6 Feb 2002 18:22:32 -0000 1.4.2.93
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.92 2002/02/05 09:04:03 richter Exp $
+# $Id: epcomp.c,v 1.4.2.93 2002/02/06 18:22:32 richter Exp $
#
###################################################################################*/
@@ -1687,6 +1687,7 @@
lprintf (r -> pApp, "Setup source code for interactive debugger\n") ;
}
+ UndefSub (r, r -> Component.sMainSub, r -> Component.sCurrPackage) ;
rc = EvalOnly (r, r -> Component.pProgRun, pProg, G_SCALAR, r -> Component.sMainSub) ;
StringFree (r -> pApp, &r -> Component.pProgRun) ;
1.15.4.40 +2 -2 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.39
retrieving revision 1.15.4.40
diff -u -r1.15.4.39 -r1.15.4.40
--- eputil.c 6 Feb 2002 09:21:07 -0000 1.15.4.39
+++ eputil.c 6 Feb 2002 18:22:32 -0000 1.15.4.40
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.39 2002/02/06 09:21:07 richter Exp $
+# $Id: eputil.c,v 1.15.4.40 2002/02/06 18:22:32 richter Exp $
#
###################################################################################*/
@@ -1541,7 +1541,7 @@
{
epTHX_
AV *pPathAV = r -> Config.pPathAV ;
- int skip = 0 ;
+ int skip = r -> Component.pPrev?r -> Component.pPrev -> nPathNdx:0 ;
int i ;
struct stat st ;
char * fn ;
No revision
No revision
1.1.2.3 +2 -2 embperl/Embperl/Attic/Constant.pm
Index: Constant.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Constant.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Constant.pm 5 Feb 2002 09:04:05 -0000 1.1.2.2
+++ Constant.pm 6 Feb 2002 18:22:33 -0000 1.1.2.3
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Constant.pm,v 1.1.2.2 2002/02/05 09:04:05 richter Exp $
+# $Id: Constant.pm,v 1.1.2.3 2002/02/06 18:22:33 richter Exp $
#
###################################################################################
@@ -132,6 +132,6 @@
use constant rcUnclosedHtml => 45 ;
use constant rcUnclosedCmd => 46 ;
use constant rcNotAllowed => 47 ;
-
+use constant rcForbidden => 401 ;
1;
1.1.2.5 +13 -16 embperl/Embperl/Attic/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Object.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Object.pm 29 Jan 2002 16:02:52 -0000 1.1.2.4
+++ Object.pm 6 Feb 2002 18:22:33 -0000 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Object.pm,v 1.1.2.4 2002/01/29 16:02:52 richter Exp $
+# $Id: Object.pm,v 1.1.2.5 2002/02/06 18:22:33 richter Exp $
#
###################################################################################
@@ -26,18 +26,10 @@
use Embperl ;
use Embperl::Constant ;
-if (defined ($ENV{MOD_PERL}))
- {
- eval 'use Apache::Constants qw(&OPT_EXECCGI &DECLINED &OK &FORBIDDEN &NOT_FOUND) ;' ;
- die "use Apache::Constants failed: $@" if ($@);
- }
-else
- {
- eval 'sub OK { 0 ; }' ;
- eval 'sub NOT_FOUND { 404 ; }' ;
- eval 'sub FORBIDDEN { 403 ; }' ;
- eval 'sub DECLINED { 403 ; }' ; # in non mod_perl environement, same as FORBIDDEN
- }
+use constant OK => 0 ;
+use constant NOT_FOUND => 404 ;
+use constant FORBIDDEN => 403 ;
+use constant DECLINED => $ENV{MOD_PERL}?-1:403 ;
use File::Spec ;
@@ -242,7 +234,7 @@
push @searchpath, @$addpath if ($addpath) ;
if (!$found)
{
- foreach $ap (@addpath)
+ foreach $ap (@$addpath)
{
next if (!$ap) ;
$fn = "$ap/$basename" ;
@@ -272,7 +264,12 @@
$filename = $req -> {object_fallback} ;
print Embperl::LOG "[$$]Embperl::Object use fallback: $filename\n" if ($debug);
}
-
+
+ if ($fn eq $filename)
+ {
+ $r -> logerror (Embperl::Constant::rcForbidden, $filename, $apr) ;
+ return FORBIDDEN ;
+ }
my $package = $req -> {'package'} || $packages{$filename} ;
@@ -344,7 +341,7 @@
}
- $apr -> log_error ("Embperl::Object searched '@searchpath'" . ($addpath?" and '$addpath' ":'')) if ($apr) ;
+ $apr -> log_error ("Embperl::Object $basename not found. Searched '@searchpath'" . ($addpath?" and '@$addpath' ":'')) if ($apr) ;
return &NOT_FOUND ;
}
No revision
No revision
1.1.2.5 +7 -7 embperl/test/cmp/epobase.htm
Index: epobase.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobase.htm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- epobase.htm 2 Nov 2001 11:34:27 -0000 1.1.2.4
+++ epobase.htm 6 Feb 2002 18:22:33 -0000 1.1.2.5
@@ -1,10 +1,10 @@
-<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD><BODY bgcolor="#FFFFFF">
-<H1>Internal Server Error</H1>
-The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
-^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 30\: epobase.htm\((1|6)\): Not found <no filename><p>
-^ HTML\:\:Embperl.*?<P>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<HTML><HEAD>
+<TITLE>403 Forbidden</TITLE>
+</HEAD><BODY>
+<H1>Forbidden</H1>
+You don't have permission to access /embperl/EmbperlObject/epobase.htm
+on this server.<P>
</BODY></HTML>
No revision
No revision
1.24.4.34 +1 -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.24.4.33
retrieving revision 1.24.4.34
diff -u -r1.24.4.33 -r1.24.4.34
--- httpd.conf.src 29 Jan 2002 16:02:52 -0000 1.24.4.33
+++ httpd.conf.src 6 Feb 2002 18:22:33 -0000 1.24.4.34
@@ -126,7 +126,7 @@
PerlScript \"$EPPATH/test/conf/$EPSTARTUP\"
-#Embperl_UseEnv on
+Embperl_UseEnv on
<Location /embperl/log>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org