richter 01/12/14 12:55:54
Modified: . Tag: Embperl2c Embperl.pm Embperl.xs
EmbperlObject.pm epdat.h
test/conf Tag: Embperl2c httpd.conf.src startup.pl
Log:
Embperl app object
Revision Changes Path
No revision
No revision
1.118.4.69 +9 -3 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.68
retrieving revision 1.118.4.69
diff -u -r1.118.4.68 -r1.118.4.69
--- Embperl.pm 2001/12/13 15:13:54 1.118.4.68
+++ Embperl.pm 2001/12/14 20:55:53 1.118.4.69
@@ -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.118.4.68 2001/12/13 15:13:54 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.69 2001/12/14 20:55:53 richter Exp $
#
###################################################################################
@@ -923,11 +923,10 @@
{
bless $r, $$req{'bless'} ;
warn "\@ISA corrupted HTML::Embperl::Req must be a base class of
$$req{'bless'}" if (!$r -> isa ('HTML::Embperl::Req')) ;
+ %$r = %{$req -> {request}} if ($req -> {request}) ;
}
-
$r -> Path ($req->{path}) if ($req->{path}) ;
-
$r -> PathNdx ($pathndx) ;
$package = $r -> CurrPackage ;
@@ -1010,6 +1009,13 @@
{
@cleanups = () ;
@cleanupfuncs = () ;
+ }
+
+ if ($req -> {application} && !($r -> SubReq))
+ {
+ my $app ;
+ $r -> application ($app = $req -> {application}) ;
+ $app -> init ($r) ;
}
{
1.29.4.28 +15 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.27
retrieving revision 1.29.4.28
diff -u -r1.29.4.27 -r1.29.4.28
--- Embperl.xs 2001/12/11 09:03:50 1.29.4.27
+++ Embperl.xs 2001/12/14 20:55:53 1.29.4.28
@@ -598,6 +598,21 @@
RETVAL
+SV *
+embperl_Application(r,app=NULL)
+ tReq * r
+ SV * app
+ALIAS:
+ HTML::Embperl::Req::app = 1
+ HTML::Embperl::Req::application = 2
+CODE:
+ RETVAL = r -> pApplication ;
+ if (items > 1)
+ r -> pApplication = app ;
+OUTPUT:
+ RETVAL
+
+
int
embperl_Error(r,...)
1.36.4.9 +3 -1 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.36.4.8
retrieving revision 1.36.4.9
diff -u -r1.36.4.8 -r1.36.4.9
--- EmbperlObject.pm 2001/12/13 15:13:54 1.36.4.8
+++ EmbperlObject.pm 2001/12/14 20:55:53 1.36.4.9
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlObject.pm,v 1.36.4.8 2001/12/13 15:13:54 richter Exp $
+# $Id: EmbperlObject.pm,v 1.36.4.9 2001/12/14 20:55:53 richter Exp $
#
###################################################################################
@@ -323,6 +323,8 @@
}) ;
return 500 if (!$app) ;
+
+ $req -> {application} = $app ;
my $status = $app -> new ($req) ;
return $status if ($status) ;
1.20.4.38 +3 -1 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.20.4.37
retrieving revision 1.20.4.38
diff -u -r1.20.4.37 -r1.20.4.38
--- epdat.h 2001/12/13 15:13:54 1.20.4.37
+++ epdat.h 2001/12/14 20:55:53 1.20.4.38
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat.h,v 1.20.4.37 2001/12/13 15:13:54 richter Exp $
+# $Id: epdat.h,v 1.20.4.38 2001/12/14 20:55:53 richter Exp $
#
###################################################################################*/
@@ -400,6 +400,8 @@
SV * pApacheReqSV ;
#endif
+ SV * pApplication ; /* application object */
+
pid_t nPid ; /* process/thread id */
tConf * pConf ; /* pointer to configuration data */
No revision
No revision
1.24.4.31 +1 -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.24.4.30
retrieving revision 1.24.4.31
diff -u -r1.24.4.30 -r1.24.4.31
--- httpd.conf.src 2001/12/11 09:03:52 1.24.4.30
+++ httpd.conf.src 2001/12/14 20:55:54 1.24.4.31
@@ -483,6 +483,7 @@
SetEnv EMBPERL_RECIPE EmbperlWeb
SetEnv EMBPERL_ALLOW .
PerlSetEnv EMBPERL_OBJECT_BASE base.htm
+PerlSetEnv EMBPERL_OBJECT_APP epwebapp.pl
PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
SetHandler perl-script
1.9.6.7 +1 -1 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9.6.6
retrieving revision 1.9.6.7
diff -u -r1.9.6.6 -r1.9.6.7
--- startup.pl 2001/12/13 15:13:56 1.9.6.6
+++ startup.pl 2001/12/14 20:55:54 1.9.6.7
@@ -33,6 +33,6 @@
$cp -> share ('$testshare') ;
-###require "$ENV{EMBPERL_SRC}/eg/webutil/EmbperlWebRecipe.pm" ;
+require "$ENV{EMBPERL_SRC}/eg/webutil/EmbperlWebRecipe.pm" ;
1 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
