richter at apache
Aug 23, 2004, 10:08 PM
Post #1 of 1
(761 views)
Permalink
|
|
cvs commit: embperl Changes.pod Embperl.pm epinit.c epmain.c test.pl
|
|
richter 2004/08/23 22:08:49
Modified: . Changes.pod Embperl.pm epinit.c epmain.c test.pl
Log:
fix make test on windows
Revision Changes Path
1.249 +2 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- Changes.pod 22 Aug 2004 13:26:48 -0000 1.248
+++ Changes.pod 24 Aug 2004 05:08:48 -0000 1.249
@@ -1,6 +1,6 @@
=pod
-=head1 2.0
+=head1 2.0pre1 24. August 2004
- Addeded configuration directive Embperl_Object_Reqpath, which allows to
search serveral directories for the file of the initial request.
@@ -23,6 +23,7 @@
- use Apache::ServerRec when mod_perl version is 1.99_15 or above.
Spotted by Aare Vesi.
- Fixed endless loop on 64Bit Alpha and ia64.
+ - Fixed make test problem on Windows.
=head1 2.0b11 15. March 2004
1.192 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- Embperl.pm 22 Aug 2004 13:26:48 -0000 1.191
+++ Embperl.pm 24 Aug 2004 05:08:48 -0000 1.192
@@ -47,7 +47,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0' ;
+$VERSION = '2.0pre1' ;
if ($modperl = $ENV{MOD_PERL})
1.22 +4 -1 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- epinit.c 17 Aug 2004 06:17:58 -0000 1.21
+++ epinit.c 24 Aug 2004 05:08:48 -0000 1.22
@@ -1802,6 +1802,9 @@
if (r -> Config.bDebug)
DomStats (r -> pApp) ;
+ r -> pThread -> pCurrReq = NULL ;
+ r -> pApp -> pCurrReq = NULL ;
+
return ok ;
}
1.132 +5 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- epmain.c 16 Aug 2004 07:36:16 -0000 1.131
+++ epmain.c 24 Aug 2004 05:08:48 -0000 1.132
@@ -66,7 +66,7 @@
STRLEN l ;
pid_t nPid ;
- #ifdef PERL_IMPLICIT_CONTEXT
+#ifdef PERL_IMPLICIT_CONTEXT
pTHX ;
if (r)
aTHX = r -> pPerlTHX ;
@@ -76,6 +76,7 @@
aTHX = PERL_GET_THX ;
#endif
+
if (r)
{
r -> errdat1 [sizeof (r -> errdat1) - 1] = '\0' ;
@@ -245,6 +246,7 @@
#ifdef APACHE
if (r && r -> pApacheReq)
+ {
#ifdef APLOG_ERR
if (rc != rcPerlWarn)
ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, APLOG_STATUSCODE r -> pApacheReq -> server, "%s", sText) ;
@@ -253,6 +255,7 @@
#else
log_error (sText, r -> pApacheReq -> server) ;
#endif
+ }
else
#endif
{
1.145 +41 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- test.pl 17 Aug 2004 06:34:35 -0000 1.144
+++ test.pl 24 Aug 2004 05:08:49 -0000 1.145
@@ -265,11 +265,35 @@
'keepreq.htm' => {
'cgi' => 0,
'errors' => 1,
+ 'condition' => '!$EPWIN32',
},
'keepreq.htm' => {
'cgi' => 0,
'errors' => 1,
'cmpext' => '.2',
+ 'condition' => '!$EPWIN32',
+ },
+ 'keepreq.htm' => {
+ 'modperl' => 0,
+ 'errors' => 1,
+ 'condition' => '$EPWIN32',
+ },
+ 'keepreq.htm' => {
+ 'modperl' => 0,
+ 'errors' => 1,
+ 'cmpext' => '.2',
+ 'condition' => '$EPWIN32',
+ },
+ 'keepreq.htm' => {
+ 'modperl' => 1,
+ 'errors' => 0,
+ 'condition' => '$EPWIN32',
+ },
+ 'keepreq.htm' => {
+ 'modperl' => 1,
+ 'errors' => 0,
+ 'cmpext' => '.2',
+ 'condition' => '$EPWIN32',
},
'hostconfig.htm' => {
'modperl' => 1,
@@ -337,11 +361,23 @@
},
'registry/tied.htm' => {
'modperl' => 1,
- 'errors' => '3',
+ 'errors' => 3,
+ 'condition' => '!$EPWIN32',
+ },
+ 'registry/tied.htm' => {
+ 'modperl' => 1,
+ 'errors' => 3,
+ 'condition' => '!$EPWIN32',
+ },
+ 'registry/tied.htm' => {
+ 'modperl' => 1,
+ 'errors' => 0,
+ 'condition' => '$EPWIN32',
},
'registry/tied.htm' => {
'modperl' => 1,
- 'errors' => '3',
+ 'errors' => 0,
+ 'condition' => '$EPWIN32',
},
'callsub.htm' => {
'repeat' => 2,
@@ -1609,7 +1645,7 @@
{
# count literal \n as newline,
# because RedHat excapes newlines in error log
- my @cnt = split /(?:\\n)+/ ;
+ my @cnt = split /(?:\\n(?!ot))+/ ;
$cnt -= @cnt ;
if ($cnt < 0)
{
@@ -1935,7 +1971,7 @@
}
$errin = $err ;
- $err = CheckError ($errcnt) if ($err == 0 || ($errcnt > 0 && $err == 500) || $file eq 'notfound.htm' || $file eq 'notallow.xhtm') ;
+ $err = CheckError ($errcnt) if ($err == 0 || ($errcnt > 0 && $err == 500) || $file eq 'notfound.htm' || $file eq 'notallow.xhtm') ;
if ($err == 0 && $errin != 500 && $file ne 'notfound.htm' && $file ne 'notallow.xhtm')
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
