richter 01/03/23 05:51:46
Modified: . Tag: Embperl2c Changes.pod Makefile.PL epmain.c
epparse.c test.pl
Embperl Tag: Embperl2c Syntax.pm
Log:
Embperl 2 - bugfixes
Revision Changes Path
No revision
No revision
1.129.4.10 +2 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.9
retrieving revision 1.129.4.10
diff -u -r1.129.4.9 -r1.129.4.10
--- Changes.pod 2001/03/23 09:28:10 1.129.4.9
+++ Changes.pod 2001/03/23 13:51:44 1.129.4.10
@@ -16,7 +16,8 @@
- New [$ syntax $] metacommand can switch the syntax of the file
on the fly. It's also usefull to load addtional taglibs.
- print OUT works again
-
+ - Embperl doesn't log a warning if a undefined value is in %ENV and
+ dbgEnv is on.
=head1 2.0b1 (BETA) 22. Dec 2000
1.31.4.7 +19 -4 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.6
retrieving revision 1.31.4.7
diff -u -r1.31.4.6 -r1.31.4.7
--- Makefile.PL 2001/02/05 11:18:52 1.31.4.6
+++ Makefile.PL 2001/03/23 13:51:44 1.31.4.7
@@ -546,7 +546,7 @@
#
# Check to see which user to use for httpd tests
#
-
+$loadmodules = $EPMODPERL ;
$EPPATH = cwd ;
$EPMODPERL = '' ;
$EPSTARTUP ='startup.pl' ;
@@ -637,7 +637,7 @@
if (-f $path)
{ ## module fould
$EPMODPERL .= "\r\nLoadModule $opt->{name} $path" ;
- print " + Load dynamic module $mod\n" ;
+ print " + Load dynamic module $mod\n ($path)\n" ;
$found = 1 ;
last ;
}
@@ -649,12 +649,27 @@
if (-f $path)
{ ## module fould
$EPMODPERL .= "\r\nLoadModule $opt->{name} $path" ;
- print " + Load dynamic module $mod\n" ;
+ print " + Load dynamic module $mod\n ($path)\n" ;
$found = 1 ;
last ;
}
}
- if (!$found)
+ if (!$found && $loadmodules)
+ {
+ if ($loadmodules =~ /LoadModule $opt->{name} (.*?)$/)
+ {
+ $path = $1 ;
+ if (-f $path)
+ { ## module fould
+ $EPMODPERL .= "\r\nLoadModule $opt->{name} $path" ;
+ print " + Load dynamic module $mod\n ($path)\n" ;
+ $found = 1 ;
+ last ;
+ }
+ }
+ }
+
+ if (!$found)
{
my $w32msg = '' ;
$w32msg = "\nPlease enter full path including the drive letter!! "
if ($win32) ;
1.75.4.24 +14 -0 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.23
retrieving revision 1.75.4.24
diff -u -r1.75.4.23 -r1.75.4.24
--- epmain.c 2001/03/07 04:54:43 1.75.4.23
+++ epmain.c 2001/03/23 13:51:44 1.75.4.24
@@ -541,6 +541,8 @@
int len = 0 ;
char sLine [1024] ;
SV * pSVE ;
+ int savewarn = PL_dowarn ;
+ PL_dowarn = 0 ; /* no warnings here */
EPENTRY (GetInputData_CGIProcess) ;
@@ -552,6 +554,7 @@
if ((rc = OpenInput (r, sCmdFifo)) != ok)
{
+ PL_dowarn = savewarn ;
return rc ;
}
@@ -581,6 +584,7 @@
if (hv_store (r -> pEnvHash, sLine, strlen (sLine), pSVE, 0) == NULL)
{
+ PL_dowarn = savewarn ;
return rcHashError ;
}
if (r -> bDebug & dbgEnv)
@@ -590,7 +594,10 @@
{
len = atoi (sLine) ;
if ((p = _malloc (len + 1)) == NULL)
+ {
+ PL_dowarn = savewarn ;
return rcOutOfMemory ;
+ }
iread (p, len) ;
p[len] = '\0' ;
rc = GetFormData (p, len) ;
@@ -604,6 +611,7 @@
CloseInput () ;
+ PL_dowarn = savewarn ;
return rc ;
}
@@ -649,6 +657,8 @@
HE * pEntry ;
char * pKey ;
I32 l ;
+ int savewarn = PL_dowarn ;
+ PL_dowarn = 0 ; /* no warnings here */
hv_iterinit (r -> pEnvHash) ;
while ((pEntry = hv_iternext (r -> pEnvHash)))
@@ -658,6 +668,7 @@
lprintf (r, "[%d]ENV: %s=%s\n", r -> nPid, pKey, SvPV (psv, na))
;
}
+ PL_dowarn = savewarn ;
}
sLen [0] = '\0' ;
@@ -2690,6 +2701,9 @@
table_add(r -> pApacheReq->headers_out, sSetCookie, pstrdup(r ->
pApacheReq->pool, SvPV(pCookie, ldummy))) ;
SvREFCNT_dec (pCookie) ;
}
+#ifdef EP2
+ if (r -> bEP1Compat) // Embperl currently cannot calc Content Length
+#endif
set_content_length (r -> pApacheReq, GetContentLength (r) + (r ->
pCurrEscape?2:0)) ;
send_http_header (r -> pApacheReq) ;
#ifndef WIN32
1.4.2.15 +2 -0 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.4.2.14
retrieving revision 1.4.2.15
diff -u -r1.4.2.14 -r1.4.2.15
--- epparse.c 2001/03/23 09:28:11 1.4.2.14
+++ epparse.c 2001/03/23 13:51:44 1.4.2.15
@@ -228,6 +228,8 @@
unsigned char * pStartChars = pTokenTable -> cStartChars ;
unsigned char * pAllChars = pTokenTable -> cAllChars ;
+ r -> bDebug |= dbgBuildToken ;
+
memset (pStartChars, 0, sizeof (pTokenTable -> cStartChars)) ;
memset (pAllChars, 0, sizeof (pTokenTable -> cAllChars)) ;
pTokenTable -> bLSearch = 0 ;
1.70.4.35 +5 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.34
retrieving revision 1.70.4.35
diff -u -r1.70.4.34 -r1.70.4.35
--- test.pl 2001/03/23 09:28:11 1.70.4.34
+++ test.pl 2001/03/23 13:51:44 1.70.4.35
@@ -1053,7 +1053,7 @@
#### check commandline options #####
-if (!$opt_modperl && !$opt_cgi && !$opt_offline && !$opt_execute && !$opt_cache)
+if (!$opt_modperl && !$opt_cgi && !$opt_offline && !$opt_execute && !$opt_cache &&
!$opt_ep1)
{
if (defined ($opt_ab))
{
@@ -1154,7 +1154,7 @@
do
{
- if ($opt_offline || $opt_execute || $opt_cache)
+ if ($opt_offline || $opt_ep1 || $opt_execute || $opt_cache)
{
open (SAVEERR, ">&STDERR") || die "Cannot save stderr" ;
open (STDERR, ">$offlineerr") || die "Cannot redirect stderr" ;
@@ -1167,14 +1167,14 @@
#
#############
- if ($opt_offline) # || $opt_ep1)
+ if ($opt_offline || $opt_ep1)
{
print "\nTesting offline mode...\n\n" ;
$n = 0 ;
$t_offline = 0 ;
$n_offline = 0 ;
- foreach $ep1compat (($version == 2 && $opt_ep1)?(0, 1):(0))
+ foreach $ep1compat (($version == 2 && $opt_ep1 && $opt_offline)?(0,
1):(($version == 2 && $opt_ep1)?1:0))
{
$testnum = -1 + $startnumber ;
#next if (($ep1compat && !($opt_ep1)) || (!$ep1compat &&
!($opt_offline)));
@@ -1681,7 +1681,7 @@
- if ((($opt_execute) || ($opt_offline) || ($opt_cache)) && $looptest == 0)
+ if ((($opt_execute) || ($opt_offline) || ($opt_ep1) || ($opt_cache)) &&
$looptest == 0)
{
close STDERR ;
open (STDERR, ">&SAVEERR") ;
No revision
No revision
1.1.4.27 +2 -2 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.26
retrieving revision 1.1.4.27
diff -u -r1.1.4.26 -r1.1.4.27
--- Syntax.pm 2001/03/23 09:28:13 1.1.4.26
+++ Syntax.pm 2001/03/23 13:51:45 1.1.4.27
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.26 2001/03/23 09:28:13 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.27 2001/03/23 13:51:45 richter Exp $
#
###################################################################################
@@ -211,7 +211,7 @@
$name = join (' ', @names) ;
- print HTML::Embperl::LOG "SYNTAX: switch to $name\n" ;
+ print HTML::Embperl::LOG "[$$]SYNTAX: switch to $name\n" ;
return undef if (!$name) ;
return $Syntax{$name} if (exists ($Syntax{$name})) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
