richter 00/07/07 08:39:54
Modified: . Tag: Embperl2 Embperl.pm MANIFEST embpcgi.bat
embpcgi.pl embpcgi.test.bat embpcgi.test.pl
embpexec.bat embpexec.pl epcmd.c epdom.c epmain.c
test.pl
test/cmp Tag: Embperl2 if.htm-1 table.htm-1
test/conf Tag: Embperl2 httpd.conf.src
test/html/registry Tag: Embperl2 tied.htm
Added: test/cmp Tag: Embperl2 tagscan.htm-1
Log:
Embperl 2
Revision Changes Path
No revision
No revision
1.104.2.14 +11 -3 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.104.2.13
retrieving revision 1.104.2.14
diff -u -r1.104.2.13 -r1.104.2.14
--- Embperl.pm 2000/06/19 04:17:51 1.104.2.13
+++ Embperl.pm 2000/07/07 15:39:35 1.104.2.14
@@ -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.104.2.13 2000/06/19 04:17:51 richter Exp $
+# $Id: Embperl.pm,v 1.104.2.14 2000/07/07 15:39:35 richter Exp $
#
###################################################################################
@@ -81,7 +81,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0a5';
+$VERSION = '2.0a6';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
@@ -630,16 +630,23 @@
{
my ($req, $req_rec) = @_ ;
+ my %cgienv ;
+
if (defined ($req_rec))
{
my $k ;
my $v ;
- my %cgienv = $req_rec->cgi_env ;
+ %cgienv = $req_rec->cgi_env ;
while (($k, $v) = each %cgienv)
{
$ENV{$k} ||= $v ;
}
}
+# else
+# {
+# %cgienv = %ENV ;
+# }
+
$$req{'virtlog'} = $ENV{EMBPERL_VIRTLOG} if (exists
($ENV{EMBPERL_VIRTLOG})) ;
$$req{'compartment'} = $ENV{EMBPERL_COMPARTMENT} if (exists
($ENV{EMBPERL_COMPARTMENT})) ;
@@ -672,6 +679,7 @@
{
$_[0] -> ExecuteReq ($_[1]) ;
+ #print "Hello" ;
}
#######################################################################################
1.41.2.4 +1 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- MANIFEST 2000/06/19 04:17:52 1.41.2.3
+++ MANIFEST 2000/07/07 15:39:35 1.41.2.4
@@ -241,3 +241,4 @@
test/cmp/table.htm-1
test/cmp/var.htm-1
test/cmp/varerr.htm-1
+test/cmp/tagscan.htm-1
1.7.2.15 +2 -2 embperl/embpcgi.bat
Index: embpcgi.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.bat,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -r1.7.2.14 -r1.7.2.15
--- embpcgi.bat 2000/07/01 13:04:20 1.7.2.14
+++ embpcgi.bat 2000/07/07 15:39:35 1.7.2.15
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.7.2.15 +1 -1 embperl/embpcgi.pl
Index: embpcgi.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.pl,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -r1.7.2.14 -r1.7.2.15
--- embpcgi.pl 2000/07/01 13:04:20 1.7.2.14
+++ embpcgi.pl 2000/07/07 15:39:36 1.7.2.15
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.5.2.16 +2 -2 embperl/embpcgi.test.bat
Index: embpcgi.test.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.bat,v
retrieving revision 1.5.2.15
retrieving revision 1.5.2.16
diff -u -r1.5.2.15 -r1.5.2.16
--- embpcgi.test.bat 2000/07/01 13:04:20 1.5.2.15
+++ embpcgi.test.bat 2000/07/07 15:39:36 1.5.2.16
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.7.2.16 +1 -1 embperl/embpcgi.test.pl
Index: embpcgi.test.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.pl,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -r1.7.2.15 -r1.7.2.16
--- embpcgi.test.pl 2000/07/01 13:04:20 1.7.2.15
+++ embpcgi.test.pl 2000/07/07 15:39:37 1.7.2.16
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.18.2.15 +2 -2 embperl/embpexec.bat
Index: embpexec.bat
===================================================================
RCS file: /home/cvs/embperl/embpexec.bat,v
retrieving revision 1.18.2.14
retrieving revision 1.18.2.15
diff -u -r1.18.2.14 -r1.18.2.15
--- embpexec.bat 2000/07/01 13:04:20 1.18.2.14
+++ embpexec.bat 2000/07/07 15:39:37 1.18.2.15
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.18.2.15 +1 -1 embperl/embpexec.pl
Index: embpexec.pl
===================================================================
RCS file: /home/cvs/embperl/embpexec.pl,v
retrieving revision 1.18.2.14
retrieving revision 1.18.2.15
diff -u -r1.18.2.14 -r1.18.2.15
--- embpexec.pl 2000/07/01 13:04:22 1.18.2.14
+++ embpexec.pl 2000/07/07 15:39:37 1.18.2.15
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.33.2.3 +8 -8 embperl/epcmd.c
Index: epcmd.c
===================================================================
RCS file: /home/cvs/embperl/epcmd.c,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -u -r1.33.2.2 -r1.33.2.3
--- epcmd.c 2000/06/26 19:28:35 1.33.2.2
+++ epcmd.c 2000/07/07 15:39:37 1.33.2.3
@@ -1774,12 +1774,12 @@
}
}
- pCheck = GetHtmlArg (sArg, "CHECKED", &clen) ;
+ pCheck = GetHtmlArg (sArg, "checked", &clen) ;
if (pCheck)
{
if (!bEqual)
{ /* Remove "checked" */
- oputs (r, "<INPUT ") ;
+ oputs (r, "<input ") ;
owrite (r, sArg, pCheck - sArg) ;
@@ -1793,9 +1793,9 @@
{
if (bEqual)
{ /* Insert "checked" */
- oputs (r, "<INPUT ") ;
+ oputs (r, "<input ") ;
oputs (r, sArg) ;
- oputs (r, " CHECKED>") ;
+ oputs (r, " checked>") ;
r -> Buf.pCurrPos = NULL ; /* nothing more left of html tag */
}
@@ -1805,11 +1805,11 @@
{ /* text field */
if (pVal)
{
- oputs (r, "<INPUT ") ;
+ oputs (r, "<input ") ;
owrite (r, sArg, pVal - sArg) ;
- oputs (r, " VALUE=\"") ;
+ oputs (r, " value=\"") ;
OutputToHtml (r, pData) ;
oputs (r, "\" ") ;
@@ -1823,9 +1823,9 @@
}
else
{
- oputs (r, "<INPUT ") ;
+ oputs (r, "<input ") ;
oputs (r, sArg) ;
- oputs (r, " VALUE=\"") ;
+ oputs (r, " value=\"") ;
OutputToHtml (r, pData) ;
oputs (r, "\">") ;
1.1.2.50 +4 -2 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.1.2.49
retrieving revision 1.1.2.50
diff -u -r1.1.2.49 -r1.1.2.50
--- epdom.c 2000/07/07 10:07:57 1.1.2.49
+++ epdom.c 2000/07/07 15:39:38 1.1.2.50
@@ -1636,6 +1636,7 @@
{
tNodeData * pOldChild ;
tNode xOrgChild = xOldChild ;
+ tStringIndex n ;
Node_condClonePad (pDomTree, xOldChild) ;
pOldChild = Node_self (pDomTree, xOldChild) ;
@@ -1668,11 +1669,12 @@
else
pOldChild -> nType = ntypCDATA ;
- if (pOldChild -> nText)
- NdxStringFree (pOldChild -> nText) ;
+ n = pOldChild -> nText ;
pOldChild -> nText = String2Ndx(sText, nTextLen) ;
pOldChild -> xChilds = 0 ;
pOldChild -> bFlags |= bFlags ;
+ if (n)
+ NdxStringFree (n) ;
lprintf (pCurrReq, "rp<-- nText=%d sText=>%*.*s< nTextLen = %d SVs=%d\n",
pOldChild -> nText, nTextLen,nTextLen, sText, nTextLen, sv_count) ;
return xOldChild ;
1.65.2.17 +20 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.65.2.16
retrieving revision 1.65.2.17
diff -u -r1.65.2.16 -r1.65.2.17
--- epmain.c 2000/07/05 11:50:44 1.65.2.16
+++ epmain.c 2000/07/07 15:39:38 1.65.2.17
@@ -1732,9 +1732,13 @@
if ( pConf->sPackage )
strcat( cache_key, pConf->sPackage );
if ( pConf->bEP1Compat )
+ {
strcat( cache_key, "-1" ); /* make sure Embperl 1.x compatible files get
another namespace */
-
+ cache_key_len += 2 ;
+ }
+
ppSV = hv_fetch(pCacheHash, cache_key, cache_key_len, 0);
+ /* lprintf (r, "[%d]MEM: cache_key for %s is %s\n", r -> nPid, sSourcefile,
cache_key) ; */
if (ppSV && *ppSV)
{
@@ -2029,7 +2033,7 @@
}
lprintf (r, "[%d]REQ: %s %s ", r -> nPid, (r -> bOptions &
optSafeNamespace)?"SafeNamespace":"No Safe Eval", (r -> bOptions &
optOpcodeMask)?"OpcodeMask":"All Opcode allowed") ;
- lprintf (r, " mode = %s (%d)\n", sMode, r -> nIOType) ;
+ lprintf (r, " mode = %s (%d) %s\n", sMode, r -> nIOType, r ->
bEP1Compat?"EP 1.x":"EP 2.x") ;
lprintf (r, "[%d]REQ: Package = %s\n", r -> nPid, r -> Buf.pFile ->
sCurrPackage) ;
}
@@ -2784,6 +2788,19 @@
SV * pBufSV = NULL ;
req * pMain = r ;
+ if (!r -> bEP1Compat)
+ {
+ SV * * ppSV ;
+
+ ppSV = hv_fetch (r -> Buf.pFile -> pCacheHash, "SRCDOM", 6, 0) ;
+ if (ppSV && *ppSV)
+ {
+ r -> Buf.pBuf = NULL ;
+ r -> Buf.pFile -> nFilesize = 1 ;
+ return ok ; /* source already parsed */
+ }
+ }
+
if ((pBufSV = r -> Buf.pFile -> pBufSV) == NULL || !SvPOK (pBufSV))
{
if (SvROK(r -> pInData))
@@ -2935,7 +2952,7 @@
if (rc == ok)
rc = ReadInputFile (r) ;
- if (rc == ok && r -> Buf.pBuf == NULL)
+ if (rc == ok && r -> Buf.pBuf == NULL && r -> Buf.pFile -> nFilesize == 0)
rc = rcMissingInput ;
/* --- ok so far? if not exit ---- */
1.57.2.36 +33 -15 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.57.2.35
retrieving revision 1.57.2.36
diff -u -r1.57.2.35 -r1.57.2.36
--- test.pl 2000/07/06 06:17:42 1.57.2.35
+++ test.pl 2000/07/07 15:39:38 1.57.2.36
@@ -55,8 +55,8 @@
'inputjava.htm',
'post.htm',
'upload.htm?multval=A&multval=B&multval=C&single=S',
-## 'reqrec.htm',
-## 'reqrec.htm',
+ 'reqrec.htm',
+ 'reqrec.htm',
'rawinput/include.htm????16',
'includeerr1.htm???1',
'includeerr2.htm???1',
@@ -112,11 +112,11 @@
# avoid some warnings:
use vars qw ($httpconfsrc $httpconf $EPPORT $EPPORT2 *SAVEERR *ERR $EPHTTPDDLL
$EPSTARTUP $EPDEBUG
- $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION
+ $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EP1COMPAT
$opt_offline $opt_ep1 $opt_cgi $opt_modperl $opt_execute $opt_nokill
$opt_loop
$opt_multchild $opt_memcheck $opt_exitonmem $opt_exitonsv $opt_config
$opt_nostart $opt_uniquefn
$opt_quite $opt_ignoreerror $opt_tests $opt_blib $opt_help
$opt_dbgbreak $opt_finderr
- $opt_ddd $opt_gdb) ;
+ $opt_ddd $opt_gdb $opt_ab) ;
{
local $^W = 0 ;
@@ -190,7 +190,7 @@
$ret = GetOptions ("offline|o", "ep1|1", "cgi|c", "modperl|httpd|h", "execute|e",
"nokill|r", "loop|l:i",
"multchild|m", "memcheck|v", "exitonmem|g", "exitonsv", "config|f=s",
"nostart|x", "uniquefn|u",
"quite|q", "ignoreerror|i", "tests|t", "blib|b", "help|?", "dbgbreak",
"finderr",
- "ddd", "gdb") ;
+ "ddd", "gdb", "ab:s") ;
$opt_help = 1 if ($ret == 0) ;
@@ -256,6 +256,7 @@
# print "-b use uninstalled version (from blib/..)\n" ;
print "--ddd start apache under ddd\n" ;
print "--gdb start apache under gdb\n" ;
+ print "--ab <numreq> run test thru ApacheBench\n" ;
print "\n\n" ;
print "path\t$EPPATH\n" ;
print "httpd\t$EPHTTPD\n" ;
@@ -283,7 +284,7 @@
exit ($x) ;
}
-
+#$opt_quite = 1 if (defined ($opt_ab)) ;
$vmmaxsize = 0 ;
$vminitsize = 0 ;
@@ -522,7 +523,7 @@
if ($cnt < 0)
{
print "\n\n" if ($cnt == -1) ;
- print "[$cnt]$_\n" ;
+ print "[$cnt]$_\n" if (!defined ($opt_ab) || !(/Warn/));
$err = 1 ;
}
}
@@ -594,7 +595,11 @@
if (!$opt_modperl && !$opt_cgi && !$opt_offline && !$opt_execute)
{
- if ($EPHTTPD ne '')
+ if (defined ($opt_ab))
+ {
+ $opt_modperl = 1 ;
+ }
+ elsif ($EPHTTPD ne '')
{ $opt_modperl = $opt_cgi = $opt_offline = $opt_execute = 1 }
else
{ $opt_offline = $opt_execute = 1 }
@@ -605,8 +610,8 @@
$outfile .= ".$$" if ($opt_uniquefn) ;
$defaultdebug = 0 if ($opt_quite) ;
+$EP1COMPAT = 1 if ($opt_ep1) ;
-
if ($#ARGV >= 0)
{
if ($ARGV[0] =~ /^-/)
@@ -671,7 +676,7 @@
#
#############
- if ($opt_offline || $opt_ep1)
+ if ($opt_offline) # || $opt_ep1)
{
print "\nTesting offline mode...\n\n" ;
@@ -1144,7 +1149,19 @@
$n_req++ ;
$t1 = HTML::Embperl::Clock () ;
- $m = REQ ($loc, $file, $query_info, $outfile, $content, $upload) ;
+ $page = "$inpath/$file" ;
+ $file .= '-1' if ($opt_ep1 && -e "$page-1") ;
+ if (defined ($opt_ab))
+ {
+ $opt_ab = 10 if (!$opt_ab) ;
+ my $cmd = "ab -n $opt_ab 'http://$host:$port/$loc$file?$query_info'";
+ print "$cmd\n" ;
+ system ($cmd) and die "Cannot start ab ($!)" ;
+ }
+ else
+ {
+ $m = REQ ($loc, $file, $query_info, $outfile, $content, $upload) ;
+ }
$t_req += HTML::Embperl::Clock () - $t1 ;
if ($opt_memcheck)
@@ -1167,11 +1184,12 @@
#$errcnt++ if ($loc eq $cgiloc && $file eq 'notallow.xhtm') ;
$err = CheckError ($errcnt) if (($err == 0 || $file eq 'notfound.htm' ||
$file eq 'notallow.xhtm')) ;
- if ($err == 0 && $file ne 'notfound.htm' && $file ne 'notallow.xhtm')
+ if ($err == 0 && $file ne 'notfound.htm' && $file ne 'notallow.xhtm' &&
!defined ($opt_ab))
{
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
$org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
+ $org .= '-1' if ($opt_ep1 && -e "$org-1") ;
#print "Compare $page with $org\n" ;
$err = CmpFiles ($outfile, $org) ;
@@ -1233,13 +1251,13 @@
print "\nAll test have been passed successfully!\n\n" ;
}
-if (defined ($line = <ERR>))
+if (defined ($line = <ERR>) && !defined ($opt_ab))
{
print "\nFound unexpected output in httpd errorlog:\n" ;
print $line ;
+ while (defined ($line = <ERR>))
+ { print $line ; }
}
-while (defined ($line = <ERR>))
- { print $line ; }
close ERR ;
$fatal = 0 ;
No revision
No revision
1.1.2.2 +45 -0 embperl/test/cmp/Attic/if.htm-1
Index: if.htm-1
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/if.htm-1,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- if.htm-1 2000/06/07 04:10:40 1.1.2.1
+++ if.htm-1 2000/07/07 15:39:48 1.1.2.2
@@ -52,6 +52,51 @@
+
+<TABLE WIDTH="530" BORDER="0">
+ <TR>
+ <TD ALIGN="LEFT">
+ <A HREF="/">
+ <IMG SRC="/icons/iiilogo_narrow.gif"
+ WIDTH="" HEIGHT="" BORDER="0"
+ ALT="iii logo"
+ qqq >
+
+ </TD>
+</TR>
+</TABLE>
+
+<TABLE WIDTH="530" BORDER="0">
+ <TR>
+ <TD ALIGN="LEFT">
+ <A HREF="/">
+ <IMG SRC="/i/www.iii.co.uk/iiilogo_narrow.gif"
+ WIDTH="1" HEIGHT="2" BORDER="0"
+ ALT="iii logo"
+
onload="window.open('/iit/leavingiit.epl','dis','status=no,scrollbars=no,resizable=yes,width=370,height=320,screenX=100,screenY=100,top=100,left=100');
return false"
+ >
+
+ </TD>
+</TR>
+</TABLE>
+
+
+<IMG
+SRC=".gifSRC="/icons/iiilogo_narrow_else.gif" WIDTH="5" HEIGHT="10" BORDER="0"
+ALT="iii logo"
+>
+
+<IMG
+SRC="/i/www.iii/iit.gif" WIDTH="6" HEIGHT="11" BORDER="0"
+ALT="iit logo"
+>
+
+<IMG
+SRC="/i/www.iii/iit.gif" WIDTH="6" HEIGHT="11" BORDER="0"
+ALT="iit logo"
+qqq>
+
+
</body>
</html>
1.1.2.2 +42 -0 embperl/test/cmp/Attic/table.htm-1
Index: table.htm-1
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/table.htm-1,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- table.htm-1 2000/06/07 04:10:40 1.1.2.1
+++ table.htm-1 2000/07/07 15:39:49 1.1.2.2
@@ -380,3 +380,45 @@
</tr>
</table>
+<table border="12" width="100%">
+ <tr>
+ <td><table border="13">
+ <tr>
+ <td valign="top">
+ <a href="inhalt.htm?Region=Pfalz">Pfalz</a></td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ <a href="inhalt.htm?Region=Rheinhessen">Rheinhessen</a></td>
+ </tr>
+ </table>
+ </td>
+ <td><table border="14">
+ <tr>
+ <td valign="top"><p align="left">
+ <a href="inhalt.htm?Kategorie=Kultur">Kultur</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top"><p align="left">
+ <a href="inhalt.htm?Kategorie=Sport">Sport</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top"><p align="left">
+ <a
href="inhalt.htm?Kategorie=Veranstaltungen">Veranstaltungen</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top"><p align="left">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
No revision
No revision
1.1.2.1 +109 -0 embperl/test/cmp/Attic/tagscan.htm-1
No revision
No revision
1.19.2.3 +6 -1 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -r1.19.2.2 -r1.19.2.3
--- httpd.conf.src 2000/06/06 14:39:22 1.19.2.2
+++ httpd.conf.src 2000/07/07 15:39:52 1.19.2.3
@@ -45,6 +45,11 @@
PerlSetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
EOD
+
+print OFH "PerlSetEnv EMBPERL_EP1COMPAT 1\n" if ($EP1COMPAT);
+print OFH "SetEnv EMBPERL_EP1COMPAT 1\n" if ($EP1COMPAT);
+
+
if ($EPSESSIONVERSION)
{
print OFH <<EOD ;
@@ -68,7 +73,7 @@
}
print OFH <<EOD ;
-SetEnv EMBPERL_ALLOW asc|\\.htm\$
+SetEnv EMBPERL_ALLOW asc|\\.htm\$|\\.htm-1\$
PerlScript $EPPATH/test/conf/$EPSTARTUP
No revision
No revision
1.2.2.1 +1 -1 embperl/test/html/registry/tied.htm
Index: tied.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/tied.htm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- tied.htm 1999/10/05 06:04:10 1.2
+++ tied.htm 2000/07/07 15:39:53 1.2.2.1
@@ -91,7 +91,7 @@
print "<HTML><TITLE>Test for HTML::Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 6.) Include from memory: tied string</H1>\n" ;
-$rc = HTML::Embperl::Execute ({inputfile => 'test_tied_string_ref',
+$rc = HTML::Embperl::Execute ({inputfile => 'test_tied_string',
input => $tiedvar1,
mtime => 1}) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
