richter 00/09/11 02:53:38
Modified: . Changes.pod Embperl.pm Embperl.pod Embperl.xs
EmbperlD.pod MANIFEST Makefile.PL ep.h epmacro.h
epmain.c test.pl
Embperl Mail.pm
test/cmp delsess.htm epobaselib.htm epostopdir.htm
errdoc2.htm getdelsess.htm getsess.htm
reggetsess.htm
test/html delsess.htm errmsg2.htm
test/html/EmbperlObject/base2 epobase2.htm epostopdir.htm
test/html/EmbperlObject/lib epobase3.htm
test/html/registry reggetsess.htm
Added: . embpcgi.bat.templ embpcgi.pl.templ
embpcgi.test.pl.templ embpexec.bat.templ
embpexec.pl.templ
Removed: . embpcgi.bat embpcgi.c embpcgi.pl embpcgi.test.bat
embpcgi.test.pl embpexec.bat embpexec.pl
embpexec.test.bat embpexec.test.pl
Log:
- Embperl now runs on ActiveState Perl. With a lot of help
from Randy Korbes.
- embpcgi* and embpexec* are now geratated out of *.templ instead
of editied in place to avoid problems with cvs conflicts
and lower/uppercase on Win32. Suggest by Jens-Uwe Mager.
Revision Changes Path
1.128 +5 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- Changes.pod 2000/09/07 20:13:49 1.127
+++ Changes.pod 2000/09/11 09:53:26 1.128
@@ -6,6 +6,8 @@
NOTE: This version is only available via L<"CVS"|CVS/"INTRO">
+ - Embperl now runs on ActiveState Perl. With a lot of help
+ from Randy Korbes.
- Changed EmbperlObject search order:
* If EMBPERL_OBJECT_STOPDIR is set, this directory is taken as
the last directory in the normal search path, instead of the
@@ -19,6 +21,9 @@
calling scripts (see SetupSession and GetSession)
- Added method for deleting session data and cookie
- Added method for triggering resend of session cookie.
+ - embpcgi* and embpexec* are now geratated out of *.templ instead
+ of editied in place to avoid problems with cvs conflicts
+ and lower/uppercase on Win32. Suggest by Jens-Uwe Mager.
=head1 1.3b5 (BETA) 20. Aug 2000
1.117 +24 -6 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Embperl.pm 2000/09/07 20:13:50 1.116
+++ Embperl.pm 2000/09/11 09:53:27 1.117
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.116 2000/09/07 20:13:50 richter Exp $
+# $Id: Embperl.pm,v 1.117 2000/09/11 09:53:27 richter Exp $
#
###################################################################################
@@ -74,6 +74,7 @@
%http_headers_out
$pathsplit
+ $multiplicity
) ;
@@ -113,6 +114,8 @@
%filepack = () ; # translate filename to packagename
$packno = 1 ; # for assigning unique packagenames
+$multiplicity = Multiplicity () ;
+
@cleanups = () ; # packages which need a cleanup
$LogOutputFileno = 0 ;
$pathsplit = $^O eq 'MSWin32'?';':';|:' ; # separators for path
@@ -1185,10 +1188,10 @@
my $rc = Execute (\%req) ;
- print LOG "errors1=@errors\n" ;
+ #print LOG "errors1=@errors\n" ;
my $e = $req_rec -> pnotes ('EMBPERL_ERRORS') ;
- print LOG "errors2=@$e\n" ;
+ #print LOG "errors2=@$e\n" ;
#log_svs ("handler exit") ;
return $rc ;
@@ -1212,7 +1215,9 @@
my $packfile ;
my %addcleanup ;
my $varfile ;
-
+ my %revinc = map { ($_ => 1) } values (%INC) if ($multiplicity) ;
+ my ($k, $v) ;
+
$seen{''} = 1 ;
$seen{'dbgShowCleanup'} = 1 ;
foreach $package (@cleanups)
@@ -1222,7 +1227,13 @@
$seen{$package} = 1 ;
+ #print LOG "GVFile $package\::__ANON__\n" ;
$packfile = GVFile (*{"$package\::__ANON__"}) ;
+ if ($multiplicity && !$revinc{$packfile})
+ {
+ print LOG "$packfile -> -- eval --\n" ;
+ $packfile = "-- eval --" ;
+ }
$packfile = '-> No Perl in Source <-' if ($packfile eq ('_<' . __FILE__) ||
$packfile eq __FILE__) ;
$addcleanup = \%{"$package\:\:CLEANUP"} ;
$addcleanup -> {'CLEANUP'} = 0 ;
@@ -1250,7 +1261,13 @@
local(*ENTRY) = $val;
#print LOG "$key = " . GVFile (*ENTRY) . "\n" ;
$varfile = GVFile (*ENTRY) ;
- $glob = $package.'::'.$key ;
+ if ($multiplicity && !$revinc{$varfile})
+ {
+ print LOG "$varfile -> -- eval --\n" ;
+ $varfile = "-- eval --" ;
+ }
+
+ $glob = $package.'::'.$key ;
if (defined (*ENTRY{SCALAR}) && defined (${$glob}) && ref (${$glob})
eq 'DBIx::Recordset')
{
print LOG "[$$]CUP: Recordset $key\n" ;
@@ -1279,7 +1296,8 @@
my $i = 0 ;
my $k ;
my $v ;
- while (($k, $v) = each (%{$glob}))
+ eval { # ignore errors here (for ActiveState Perl)
+ while (($k, $v) = each (%{$glob}))
{
if ($i++ > 5)
{
@@ -1287,7 +1305,7 @@
last
}
print LOG "$k => $v, "
- }
+ } } ;
print LOG ")\n" ;
eval { untie %{$glob} ; } ;
print LOG "[$$]CUP: Error: $@\n" if ($@) ;
1.56 +12 -5 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Embperl.pod 2000/09/07 20:13:52 1.55
+++ Embperl.pod 2000/09/11 09:53:27 1.56
@@ -1947,7 +1947,7 @@
=head2 Functions/Methods for session handling
-=head2 HTML::Embperl::Req::SetupSession ($req_rec, $Inputfile)
+=head2 HTML::Embperl::Req::SetupSession ($req_rec, $Inputfile) [1.3b6+]
This can be used from an script that will later on call
L<HTML::Embperl::Execute|Execute> to
preset the session so it's available to the calling script.
@@ -1966,22 +1966,29 @@
=back
Returns a reference to L<%udat> or, if call in an array context, a reference to
L<%udat>
-and L<%mdat>.
+and L<%mdat>. See also C<CleanupSession>.
-=head2 HTML::Embperl::Req::GetSession / $r -> GetSession
+=head2 HTML::Embperl::Req::GetSession / $r -> GetSession [1.3b6+]
Returns a reference to L<%udat> or, if call in an array context, a reference to
L<%udat>
and L<%mdat>. This could be used by modules that are called from inside a Embperl
page,
where the session management is already setup. If called as a method C<$r> must be
a HTML::Embperl::Req object, which is passed as first parameter to every Embperl
page in @_ .
-=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession
+=head2 HTML::Embperl::Req::CleanupSession / $r -> CleanupSession [1.3b6+]
+Must be called at the end of a script by scripts, that uses C<SetupSession>,
+ but do not call L<HTML::Embperl::Execute|Execute>.
+If called as a method C<$r> must be
+a HTML::Embperl::Req object, which is passed as first parameter to every Embperl
page in @_ .
+
+=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession [1.3b6+]
+
Deletes the session data and removes the cookie from the browser.
If called as a method C<$r> must be
a HTML::Embperl::Req object, which is passed as first parameter to every Embperl
page in @_ .
-=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession
+=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession [1.3b6+]
Triggers a resend of the cookie. Normaly the cookie is only send the first time.
If called as a method C<$r> must be
1.29 +14 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Embperl.xs 2000/07/16 17:45:52 1.28
+++ Embperl.xs 2000/09/11 09:53:27 1.29
@@ -45,6 +45,20 @@
# /* ---- Helper ----- */
+
+
+int
+embperl_Multiplicity()
+CODE:
+#ifdef MULTIPLICITY
+ RETVAL = 1 ;
+#else
+ RETVAL = 0 ;
+#endif
+OUTPUT:
+ RETVAL
+
+
int
embperl_ResetHandler(pReqSV)
SV * pReqSV
1.29 +13 -6 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- EmbperlD.pod 2000/09/07 20:13:52 1.28
+++ EmbperlD.pod 2000/09/11 09:53:27 1.29
@@ -2,7 +2,7 @@
=head1 NAME
-HTML::Embperl - einbetten von Perlcode in HTML Dokumente
+HTML::Embperl- einbetten von Perlcode in HTML Dokumente
=head1 SYNOPSIS
@@ -1852,7 +1852,7 @@
=head2 Funktionen/Methoden f�rs Session Handling
-=head2 HTML::Embperl::Req::SetupSession ($req_rec, $Inputfile)
+=head2 HTML::Embperl::Req::SetupSession ($req_rec, $Inputfile) [1.3b6+]
Diese Funktion kann von Skripten benutzt werden die in ihrem Verlauf
L<HTML::Embperl::Execute|Execute> aufrufen, jedoch vorher schon auf die Sessiondaten
@@ -1872,9 +1872,9 @@
=back
Liefert eine Referenz auf L<%udat> oder, wenn es in einem Arraykontext aufgerufen
wird,
-eine Referenz auf L<%udat> und L<%mdat> zur�ck.
+eine Referenz auf L<%udat> und L<%mdat> zur�ck. Siehe auch C<CleanupSession>.
-=head2 HTML::Embperl::Req::GetSession / $r -> GetSession
+=head2 HTML::Embperl::Req::GetSession / $r -> GetSession [1.3b6+]
Liefert eine Referenz auf L<%udat> oder, wenn es in einem Arraykontext aufgerufen
wird,
eine Referenz auf L<%udat> und L<%mdat> zur�ck.
@@ -1882,14 +1882,21 @@
zuzugreifen, wenn das Session Handling bereits initialisiert ist.
Wenn es als eine Methode aufgerufen wird mu� C<$r> ein C<HTML::Embperl::Req> Objekt
sein.
Dieses wird als erster Parameter in @_ an jede Seite �bergeben.
+
+=head2 HTML::Embperl::Req::CleanupSession / $r -> CleanupSession [1.3b6+]
+
+Mu� am Ende B<jedes> Skripts aufgerufen werden , welches C<SetupSession> benutzt,
danach aber nicht
+L<HTML::Embperl::Execute|Execute> aufruft.
+Wenn es als eine Methode aufgerufen wird mu� C<$r> ein C<HTML::Embperl::Req> Objekt
sein.
+Dieses wird als erster Parameter in @_ an jede Seite �bergeben.
-=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession
+=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession [1.3b6+]
L�scht die Sessiondaten und entfernt den Cookie vom Browser.
Wenn es als eine Methode aufgerufen wird mu� C<$r> ein C<HTML::Embperl::Req> Objekt
sein.
Dieses wird als erster Parameter in @_ an jede Seite �bergeben.
-=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession
+=head2 HTML::Embperl::Req::DeleteSession / $r -> DeleteSession [1.3b6+]
St��t das nochmalige senden des Cookies an. Normalerweise wird der Cookie nur beim
ersten
Mal gesendet.
1.50 +6 -8 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- MANIFEST 2000/09/07 20:13:53 1.49
+++ MANIFEST 2000/09/11 09:53:28 1.50
@@ -30,14 +30,12 @@
eg/x/recordset.htm
eg/x/Execute.pl
eg/x/upload.htm
-embpcgi.c
embperl.h
-embpexec.pl
-embpexec.bat
-embpcgi.pl
-embpcgi.bat
-embpcgi.test.pl
-embpcgi.test.bat
+embpexec.pl.templ
+embpexec.bat.templ
+embpcgi.pl.templ
+embpcgi.bat.templ
+embpcgi.test.pl.templ
ep.h
epdat.h
epio.c
@@ -223,7 +221,7 @@
test/cmp/execgetsess.htm
test/cmp/delsess.htm
test/cmp/getdelsess.htm
-test/cmp/registry/reggetsess.htm
+test/cmp/reggetsess.htm
test/cmp/errdoc.htm
test/cmp/errdoc2.htm
test/cmp/clearsess.htm
1.31 +10 -4 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.PL 2000/07/17 05:16:07 1.30
+++ Makefile.PL 2000/09/11 09:53:28 1.31
@@ -354,6 +354,7 @@
$apache = 2 ;
$b = 1 ;
$apache_src = $ENV{APACHE_SRC} ;
+ $apache_src = '' if ($apache_src eq '-') ;
}
if (!$apache && $apache_src eq '')
@@ -878,6 +879,10 @@
}
}
}
+
+ $d .= ' -D_WINDOWS ';
+ $d .= ' -DMULTIPLICITY' if ($Config{usemultiplicity}) ;
+
}
$dynlib->{'OTHERLDFLAGS'} .= " $lddebug" ;
@@ -898,6 +903,9 @@
'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'},
'dynamic_lib' => $dynlib,
'PREREQ_PM' => { 'File::Spec' => 0 },
+ 'ABSTRACT' => 'Embed Perl code in HTML documents',
+ 'AUTHOR' => 'Gerald Richter <[EMAIL PROTECTED]>',
+
);
@@ -907,7 +915,7 @@
#
@bins = ('embpexec.pl','embpexec.bat',
- 'embpcgi.pl', 'embpcgi.test.pl', 'embpcgi.bat', 'embpcgi.test.bat',) ;
+ 'embpcgi.pl', 'embpcgi.test.pl', 'embpcgi.bat') ;
die "Missing path to perl binary" if (!$perlbinpath) ;
@@ -915,9 +923,7 @@
foreach $f (@bins)
{
- unlink "$f.org" ;
- rename $f, "$f.org" or die "Cannot rename $f to $f.org" ;
- open IN, "<$f.org" or die "Cannot open $f.org" ;
+ open IN, "<$f.templ" or die "Cannot open $f.templ" ;
open OUT, ">$f" or die "Cannot open $f" ;
my $l = 1 ;
while (<IN>)
1.25 +5 -0 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ep.h 2000/07/08 13:06:45 1.24
+++ ep.h 2000/09/11 09:53:30 1.25
@@ -86,6 +86,11 @@
#undef stat
#endif
+#ifdef lstat
+#define apache_lstat lstat
+#undef lstat
+#endif
+
#ifdef sleep
#define apache_sleep sleep
#undef sleep
1.6 +2 -2 embperl/epmacro.h
Index: epmacro.h
===================================================================
RCS file: /home/cvs/embperl/epmacro.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- epmacro.h 2000/08/20 17:50:13 1.5
+++ epmacro.h 2000/09/11 09:53:30 1.6
@@ -60,7 +60,7 @@
return 0 ; \
} \
\
- int EMBPERL_mgSet##name (SV * pSV, MAGIC * mg) \
+int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
return 0 ; \
@@ -79,7 +79,7 @@
return 0 ; \
} \
\
- int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
\
1.74 +2 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- epmain.c 2000/09/07 20:13:54 1.73
+++ epmain.c 2000/09/11 09:53:30 1.74
@@ -157,7 +157,8 @@
if (r -> nIOType != epIOCGI)
#endif
{
- fprintf (stderr, "%s\n", sText) ;
+ /*fprintf (stderr, "%s\n", sText) ;*/
+ PerlIO_printf (PerlIO_stderr(), "%s\n", sText) ;
fflush (stderr) ;
}
}
@@ -2347,7 +2348,6 @@
MAGIC * pMG ;
char * pUID = NULL ;
STRLEN ulen = 0 ;
- // $http_headers_out{'Set-Cookie'} = "EMBPERL_UID=; expires=Thu,
1-Jan-1970 00:00:01 GMT";
if (r -> nSessionMgnt)
{
1.70 +1 -0 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- test.pl 2000/09/07 20:13:55 1.69
+++ test.pl 2000/09/11 09:53:30 1.70
@@ -55,6 +55,7 @@
'registry/errpage.htm???16',
'registry/tied.htm???3',
'registry/tied.htm???3',
+# 'registry/subreq2.htm',
'callsub.htm',
'callsub.htm',
'importsub.htm',
1.1 embperl/embpcgi.bat.templ
Index: embpcgi.bat.templ
===================================================================
@rem = '--*-Perl-*--
@echo off
/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
#!/usr/bin/perl --
#line 8
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
###################################################################################
use HTML::Embperl;
my $rc = HTML::Embperl::runcgi ;
if ($rc)
{
$time = localtime ;
print <<EOT;
Status: $rc
Content-Type: text/html
<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD>
<BODY bgcolor=\"#FFFFFF\">
<H1>embpcgi Server Error: $rc</H1>
Please contact the server administrator, $ENV{SERVER_ADMIN} and inform them of the
time the error occurred, and anything you might have done that may have caused the
error.<P><P>
$ENV{SERVER_SOFTWARE} HTML::Embperl $HTML::Embperl::VERSION [$time]<P>
</BODY></HTML>
EOT
}
__END__
:endofperl
1.1 embperl/embpcgi.pl.templ
Index: embpcgi.pl.templ
===================================================================
#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
###################################################################################
use HTML::Embperl;
my $rc = HTML::Embperl::runcgi ;
if ($rc)
{
$time = localtime ;
print <<EOT;
Status: $rc
Content-Type: text/html
<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD>
<BODY bgcolor=\"#FFFFFF\">
<H1>embpcgi Server Error: $rc</H1>
Please contact the server administrator, $ENV{SERVER_ADMIN} and inform them of the
time the error occurred, and anything you might have done that may have caused the
error.<P><P>
$ENV{SERVER_SOFTWARE} HTML::Embperl $HTML::Embperl::VERSION [$time]<P>
</BODY></HTML>
EOT
}
1.1 embperl/embpcgi.test.pl.templ
Index: embpcgi.test.pl.templ
===================================================================
#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
###################################################################################
BEGIN
{
use ExtUtils::testlib ;
eval { require Apache::Session; } if ($ENV{EMBPERL_SESSION_CLASSES}) ;
$@ = '' ;
}
use HTML::Embperl;
$^W = 1;
my $rc = HTML::Embperl::runcgi ;
if ($rc)
{
$time = localtime ;
print <<EOT;
Status: $rc
Content-Type: text/html
<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD>
<BODY bgcolor=\"#FFFFFF\">
<H1>embpcgi Server Error: $rc</H1>
Please contact the server administrator, $ENV{SERVER_ADMIN} and inform them of the
time the error occurred, and anything you might have done that may have caused the
error.<P><P>
$ENV{SERVER_SOFTWARE} HTML::Embperl $HTML::Embperl::VERSION [$time]<P>
</BODY></HTML>
EOT
}
1.1 embperl/embpexec.bat.templ
Index: embpexec.bat.templ
===================================================================
@rem = '--*-Perl-*--
@echo off
/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
#!/usr/bin/perl --
#line 8
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
###################################################################################
use HTML::Embperl;
die "Do not use as CGI script. Use 'embpcgi.bat' instead" if ($ENV{PATH_TRANSLATED})
;
HTML::Embperl::run (@ARGV) ;
__END__
:endofperl
1.1 embperl/embpexec.pl.templ
Index: embpexec.pl.templ
===================================================================
#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
###################################################################################
use HTML::Embperl;
die "Do not use as CGI script. Use 'embpcgi.pl' instead" if ($ENV{PATH_TRANSLATED}) ;
HTML::Embperl::run (@ARGV) ;
1.29 +1 -1 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Mail.pm 2000/08/10 19:32:47 1.28
+++ Mail.pm 2000/09/11 09:53:33 1.29
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.28 2000/08/10 19:32:47 richter Exp $
+# $Id: Mail.pm,v 1.29 2000/09/11 09:53:33 richter Exp $
#
###################################################################################
@@ -140,7 +140,7 @@
=head1 NAME
-HTML::EmbperlObject - Extents HTML::Embperl for building webpages out of small
objects
+HTML::Embperl::Mail - Sends results from Embperl via E-Mail
=head1 SYNOPSIS
1.2 +12 -12 embperl/test/cmp/delsess.htm
Index: delsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/delsess.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delsess.htm 2000/09/07 20:14:09 1.1
+++ delsess.htm 2000/09/11 09:53:33 1.2
@@ -13,20 +13,20 @@
</tr>
</table>
- ok (num=1)<p>
+^ ok \(num=\d+\)<p>
$mdat{cnt} = -- <br>
$udat{cnt} = -- <br>
-
- udat after:<br>
- <table>
- <tr>
- <td>a</td><td>1</td>
- </tr>
- </table>
-
- ok (num=1)<p>
-
+
+ udat after:<br>
+ <table>
+ <tr>
+ <td>a</td><td>1</td>
+ </tr>
+ </table>
+
+^ ok \(num=\d+\)<p>
+
</body>
</html>
-
+
1.2 +5 -5 embperl/test/cmp/epobaselib.htm
Index: epobaselib.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobaselib.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epobaselib.htm 2000/08/24 06:03:48 1.1
+++ epobaselib.htm 2000/09/11 09:53:33 1.2
@@ -4,15 +4,15 @@
</head>
<body>
<h1>head from foo</h1>
-
+
PAGE with base from lib
-
+
PAGE from lib
-
+
<hr> Footer <hr>
-
+
</body>
</html>
-
+
1.2 +6 -6 embperl/test/cmp/epostopdir.htm
Index: epostopdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epostopdir.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epostopdir.htm 2000/08/24 06:03:48 1.1
+++ epostopdir.htm 2000/09/11 09:53:33 1.2
@@ -4,16 +4,16 @@
</head>
<body>
<h1>head from foo</h1>
-
- PAGE 1 (Header and Footer found with STOPDIR)
-
+ PAGE 1 (Header and Footer found with STOPDIR)
+
+
PAGE from lib
-
+
<hr> Footer <hr>
-
+
</body>
</html>
-
+
1.2 +37 -37 embperl/test/cmp/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/errdoc2.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- errdoc2.htm 2000/08/24 06:03:48 1.1
+++ errdoc2.htm 2000/09/11 09:53:33 1.2
@@ -6,48 +6,48 @@
<body>
This page is shown due to an ErrorDocument redirection<p>
-
-
+
+
main:
^prev: Apache=SCALAR
next:
^last: Apache=SCALAR
-There are 15 errormessages:
-
-<table border=1>
-^ <tr><td>\[\d+\]ERR: 32: Line 13: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 14: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 15: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 16: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 17: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 21: Warning in Perl code: Unquoted string
"qqqqqqqqqqqqqq" may clash with future reserved word at
-
-^ <tr><td>\[\d+\]ERR: 24: Line 21: Error in Perl code: syntax error at
-
-^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: syntax error at
-
-^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: Can't call method
"qq2" without a package or object reference at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 32: Warning in Perl code: Use of uninitialized
value at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: Bareword found where
operator expected at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: \(Missing
operator before is\?\)</td></tr>
-
+^There are 1(2|5) errormessages:
+
+<table border=1>
+^ <tr><td>\[\d+\]ERR: 32: Line 13: Warning in Perl code: Use of uninitialized
value
+
+^ <tr><td>\[\d+\]ERR: 32: Line 14: Warning in Perl code: Use of uninitialized
value
+
+^ <tr><td>\[\d+\]ERR: 32: Line 15: Warning in Perl code: Use of uninitialized
value
+
+^ <tr><td>\[\d+\]ERR: 32: Line 16: Warning in Perl code: Use of uninitialized
value
+
+^ <tr><td>\[\d+\]ERR: 32: Line 17: Warning in Perl code: Use of uninitialized
value
+
+^- <tr><td>\[\d+\]ERR: 32: Line 21: Warning in Perl code: Unquoted string
"qqqqqqqqqqqqqq" may clash with future reserved word at
+^-
+^ <tr><td>\[\d+\]ERR: 24: Line 21: Error in Perl code: syntax error at
+
+^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: syntax error at
+
+^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: Can't call method
"qq2" without a package or object reference at
+
+^ <tr><td>\[\d+\]ERR: 32: Line 32: Warning in Perl code: Use of uninitialized
value
+
+^- <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: Bareword found where
operator expected at
+^-
+^- <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: \(Missing
operator before is\?\)</td></tr>
+^-
^ <tr><td>\[\d+\]ERR: 24: Line 46: Error in Perl code: syntax error at
-^Missing right bracket at
-^syntax error at
-
-^ <tr><td>\[\d+\]ERR: 20: Line 58: </tr> without <tr></td></tr>
-
-^ <tr><td>\[\d+\]ERR: 45: Line 58: Unclosed HTML tag <table> at end of
file </td></tr>
-</table>
+^Missing right.*?bracket at
+^syntax error at
+^ <tr><td>\[\d+\]ERR: 20: Line 58: </tr> without <tr></td></tr>
+
+^ <tr><td>\[\d+\]ERR: 45: Line 58: Unclosed HTML tag <table> at end of
file </td></tr>
+</table>
+
</body>
</html>
-
+
1.2 +30 -2 embperl/test/cmp/getdelsess.htm
Index: getdelsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/getdelsess.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getdelsess.htm 2000/09/07 20:14:10 1.1
+++ getdelsess.htm 2000/09/11 09:53:34 1.2
@@ -20,7 +20,35 @@
sessions:
- <table></table>
+^ <table>
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
+^- </table>
</body>
</html>
-
+
1.4 +4 -0 embperl/test/cmp/getsess.htm
Index: getsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/getsess.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getsess.htm 1999/10/05 06:02:07 1.3
+++ getsess.htm 2000/09/11 09:53:34 1.4
@@ -40,6 +40,10 @@
^- <tr>
^- <td>.*?<\/td><td>HASH.*?<\/td>
^- </tr>
+^-
+^- <tr>
+^- <td>.*?<\/td><td>HASH.*?<\/td>
+^- </tr>
^- </table>
</body>
</html>
1.2 +1 -1 embperl/test/cmp/reggetsess.htm
Index: reggetsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/reggetsess.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reggetsess.htm 2000/09/07 20:14:10 1.1
+++ reggetsess.htm 2000/09/11 09:53:34 1.2
@@ -1,4 +1,4 @@
<HTML><TITLE>Test for HTML::Embperl::Req::SetupSession</TITLE><BODY>
a = 1 <BR>
-<P>Here is some text inside of Execute</P>
+<P>Here is some text inside of Execute</P>
</BODY></HTML>
1.2 +12 -12 embperl/test/html/delsess.htm
Index: delsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/delsess.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delsess.htm 2000/09/07 20:14:13 1.1
+++ delsess.htm 2000/09/11 09:53:36 1.2
@@ -19,19 +19,19 @@
$mdat{cnt} = -[+ $mdat{cnt} ; +]- <br>
$udat{cnt} = -[+ $udat{cnt} ; +]- <br>
-
+
[- HTML::Embperl::Req::DeleteSession (undef, 1) ; -]
+
+ udat after:<br>
+ [- @ks = grep (!/^_/, sort (keys %udat)) ; $num = keys (%udat) - $#ks - 1 ; -]
+
+ <table>
+ <tr>
+ <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+ [+ $num > 0?"ok (num=$num)":"Not a session hash (num=$num)" +]<p>
- udat after:<br>
- [- @ks = grep (!/^_/, sort (keys %udat)) ; $num = keys (%udat) - $#ks - 1 ; -]
-
- <table>
- <tr>
- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
- </tr>
- </table>
-
- [+ $num > 0?"ok (num=$num)":"Not a session hash (num=$num)" +]<p>
-
</body>
</html>
1.2 +16 -16 embperl/test/html/errmsg2.htm
Index: errmsg2.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/errmsg2.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- errmsg2.htm 2000/08/24 06:03:48 1.1
+++ errmsg2.htm 2000/09/11 09:53:36 1.2
@@ -6,22 +6,22 @@
<body>
This page is shown due to an ErrorDocument redirection<p>
-
-
-main: [+ $req_rec -> main +]
-prev: [+ $req_rec -> prev +]
-next: [+ $req_rec -> next +]
-last: [+ $req_rec -> last +]
-
-[-
-$errors = $req_rec -> prev -> pnotes('EMBPERL_ERRORS') ;
--]
-
-There are [+ scalar(@$errors) +] errormessages:
-
-<table border=1>
- <tr><td>[+ $errors -> [$row] +]</td></tr>
-</table>
+
+
+main: [+ $req_rec -> main +]
+prev: [+ $req_rec -> prev +]
+next: [+ $req_rec -> next +]
+last: [+ $req_rec -> last +]
+
+[-
+$errors = $req_rec -> prev -> pnotes('EMBPERL_ERRORS') ;
+-]
+
+There are [+ scalar(@$errors) +] errormessages:
+
+<table border=1>
+ <tr><td>[+ $errors -> [$row] +]</td></tr>
+</table>
</body>
</html>
1.2 +1 -1 embperl/test/html/EmbperlObject/base2/epobase2.htm
Index: epobase2.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/base2/epobase2.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epobase2.htm 2000/08/24 06:03:48 1.1
+++ epobase2.htm 2000/09/11 09:53:37 1.2
@@ -4,7 +4,7 @@
</head>
<body>
[- Execute ('epohead.htm') -]
- [- Execute ('*') -]
+ [- Execute ('*') -]
[- Execute ('epolib.htm') -]
[- Execute ('epofoot.htm') -]
</body>
1.2 +1 -1 embperl/test/html/EmbperlObject/base2/epostopdir.htm
Index: epostopdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/base2/epostopdir.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epostopdir.htm 2000/08/24 06:03:48 1.1
+++ epostopdir.htm 2000/09/11 09:53:37 1.2
@@ -1,2 +1,2 @@
- PAGE 1 (Header and Footer found with STOPDIR)
+ PAGE 1 (Header and Footer found with STOPDIR)
1.2 +1 -1 embperl/test/html/EmbperlObject/lib/epobase3.htm
Index: epobase3.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/lib/epobase3.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epobase3.htm 2000/08/24 06:03:49 1.1
+++ epobase3.htm 2000/09/11 09:53:38 1.2
@@ -4,7 +4,7 @@
</head>
<body>
[- Execute ('epohead.htm') -]
- [- Execute ('*') -]
+ [- Execute ('*') -]
[- Execute ('epolib.htm') -]
[- Execute ('epofoot.htm') -]
</body>
1.2 +42 -42 embperl/test/html/registry/reggetsess.htm
Index: reggetsess.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/reggetsess.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reggetsess.htm 2000/09/07 20:14:15 1.1
+++ reggetsess.htm 2000/09/11 09:53:38 1.2
@@ -1,42 +1,42 @@
-#
-# run this under mod_perl / Apache::Registry
-#
-
-
-use HTML::Embperl ;
-
-my($r) = @_;
-
-$HTML::Embperl::DebugDefault = 811005 ;
-
-
-$r -> status (200) ;
-$r -> send_http_header () ;
-
-print "<HTML><TITLE>Test for HTML::Embperl::Req::SetupSession</TITLE><BODY>\n" ;
-
-
-my $session = HTML::Embperl::Req::SetupSession ($r) ;
-
-$off = 0 ; $off-- if ($HTML::Embperl::SessionMgnt == 2 && !defined (tied
(%$session) -> getid)) ;
-@ks = grep (!/^_/, sort (keys %$session)) ; $num = keys (%$session) - $#ks - 1 +
$off ;
-
-foreach (@ks)
- {
- print "$_ = $session->{$_} <BR>\n" ;
- }
-
-$tst1 = '<P>Here is some text inside of Execute</P>' ;
-
-
-HTML::Embperl::Execute ({input => \$tst1,
- mtime => 1,
- inputfile => 'Some text',
- }) ;
-
-
-
-
-
-
-print "</BODY></HTML>\n" ;
+#
+# run this under mod_perl / Apache::Registry
+#
+
+
+use HTML::Embperl ;
+
+my($r) = @_;
+
+$HTML::Embperl::DebugDefault = 811005 ;
+
+
+$r -> status (200) ;
+$r -> send_http_header () ;
+
+print "<HTML><TITLE>Test for HTML::Embperl::Req::SetupSession</TITLE><BODY>\n" ;
+
+
+my $session = HTML::Embperl::Req::SetupSession ($r) ;
+
+$off = 0 ; $off-- if ($HTML::Embperl::SessionMgnt == 2 && !defined (tied
(%$session) -> getid)) ;
+@ks = grep (!/^_/, sort (keys %$session)) ; $num = keys (%$session) - $#ks - 1 +
$off ;
+
+foreach (@ks)
+ {
+ print "$_ = $session->{$_} <BR>\n" ;
+ }
+
+$tst1 = '<P>Here is some text inside of Execute</P>' ;
+
+
+HTML::Embperl::Execute ({input => \$tst1,
+ mtime => 1,
+ inputfile => 'Some text',
+ }) ;
+
+
+
+
+
+
+print "</BODY></HTML>\n" ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
