richter 01/05/28 23:14:51
Modified: . Tag: Embperl2c Embperl.xs Makefile.PL
test/html/registry Tag: Embperl2c Execute.htm errpage.htm
Log:
Embperl 2 - sync 1 <-> 2
Revision Changes Path
No revision
No revision
1.29.4.19 +30 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.18
retrieving revision 1.29.4.19
diff -u -r1.29.4.18 -r1.29.4.19
--- Embperl.xs 2001/05/26 15:45:09 1.29.4.18
+++ Embperl.xs 2001/05/29 06:14:51 1.29.4.19
@@ -215,10 +215,16 @@
SV * pApacheReqSV
PREINIT:
tReq * r = pCurrReq ;
+ int bRestore = 0 ;
+ SV * pSaveApacheReqSV ;
+ request_rec * pSaveApacheReq ;
CODE:
#ifdef APACHE
if (pApacheReqSV && r -> pApacheReq == NULL)
{
+ bRestore = 1 ;
+ pSaveApacheReqSV = r -> pApacheReqSV ;
+ pSaveApacheReq = r -> pApacheReq ;
if (SvROK (pApacheReqSV))
r -> pApacheReq = (request_rec *)SvIV((SV*)SvRV(pApacheReqSV));
else
@@ -228,6 +234,14 @@
#endif
strncpy (r->errdat1, sText, sizeof (r->errdat1) - 1) ;
LogError (r,code) ;
+#ifdef APACHE
+ if (bRestore)
+ {
+ r -> pApacheReqSV = pSaveApacheReqSV ;
+ r -> pApacheReq = pSaveApacheReq ;
+ }
+#endif
+
void
@@ -610,10 +624,17 @@
int code
char * sText
SV * pApacheReqSV
+PREINIT:
+ int bRestore = 0 ;
+ SV * pSaveApacheReqSV ;
+ request_rec * pSaveApacheReq ;
CODE:
#ifdef APACHE
if (pApacheReqSV && r -> pApacheReq == NULL)
{
+ bRestore = 1 ;
+ pSaveApacheReqSV = r -> pApacheReqSV ;
+ pSaveApacheReq = r -> pApacheReq ;
if (SvROK (pApacheReqSV))
r -> pApacheReq = (request_rec *)SvIV((SV*)SvRV(pApacheReqSV));
else
@@ -623,6 +644,15 @@
#endif
strncpy (r->errdat1, sText, sizeof (r->errdat1) - 1) ;
LogError (r,code) ;
+#ifdef APACHE
+ if (bRestore)
+ {
+ r -> pApacheReqSV = pSaveApacheReqSV ;
+ r -> pApacheReq = pSaveApacheReq ;
+ }
+#endif
+
+
int
embperl_getloghandle(r)
1.31.4.17 +4 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.16
retrieving revision 1.31.4.17
diff -u -r1.31.4.16 -r1.31.4.17
--- Makefile.PL 2001/05/17 15:24:22 1.31.4.16
+++ Makefile.PL 2001/05/29 06:14:51 1.31.4.17
@@ -647,18 +647,21 @@
{
$EPHTTPD = "$EPHTTPDDLL/Apache.exe" ;
$EPHTTPD =~ s#core([rd])/Apache.exe#Apache$1/Apache.exe#i ;
+ $EPHTTPD =~ s#libexec/Apache.exe#Apache.exe#i ;
$EPUSER = 'www' ; # dummy value
$EPGROUP = 'www' ;
if (!-e $EPHTTPD)
{
$EPHTTPD = GetString ("Enter path and file to start as Apache.exe",
"$EPHTTPD") ;
}
+ $EPHTTPDPATH = $EPHTTPD ;
+ $EPHTTPDPATH =~ s/Apache.exe//i ;
}
### check the apache version ###
- $EPENVPATH =
";$EPHTTPDDLL;$EPHTTPDDLL/../os/win32/release;$EPHTTPDDLL/../os/win32/debug" ;
+ $EPENVPATH =
";$Config{bin};$EPHTTPDDLL;$EPHTTPDPATH;$EPHTTPDDLL/../os/win32/release;$EPHTTPDDLL/../os/win32/debug"
;
$ENV{PATH} .= $EPENVPATH if ($win32) ;
@EPAPACHEVERSION = start ("$EPHTTPD -v") ;
No revision
No revision
1.1.2.1.6.3 +8 -0 embperl/test/html/registry/Execute.htm
Index: Execute.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/Execute.htm,v
retrieving revision 1.1.2.1.6.2
retrieving revision 1.1.2.1.6.3
diff -u -r1.1.2.1.6.2 -r1.1.2.1.6.3
--- Execute.htm 2000/12/20 05:27:39 1.1.2.1.6.2
+++ Execute.htm 2001/05/29 06:14:51 1.1.2.1.6.3
@@ -9,6 +9,14 @@
my($r) = @_;
+# workaround for broken $r -> chdir_file in Apache::Registry on ActiveState perl
+use Cwd ;
+use File::Basename ;
+
+my $fn = $r -> filename ;
+chdir(dirname ($fn)) ;
+
+
$HTML::Embperl::DebugDefault = 811005 ;
1.1.2.1.6.1 +7 -0 embperl/test/html/registry/errpage.htm
Index: errpage.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/errpage.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.6.1
diff -u -r1.1.2.1 -r1.1.2.1.6.1
--- errpage.htm 1998/07/14 20:11:25 1.1.2.1
+++ errpage.htm 2001/05/29 06:14:51 1.1.2.1.6.1
@@ -9,6 +9,13 @@
my($r) = @_;
+# workaround for broken $r -> chdir_file in Apache::Registry on ActiveState perl
+use Cwd ;
+use File::Basename ;
+
+my $fn = $r -> filename ;
+chdir(dirname ($fn)) ;
+
$HTML::Embperl::DebugDefault = 811005 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
