richter 00/12/04 01:17:43
Modified: . Tag: Embperl2c Embperl.pm Embperl.pod EmbperlD.pod
Faq.pod INSTALL.pod MANIFEST embperl.h epcmd.c
epcomp.c epdom.c epmain.c test.pl
eg/images Tag: Embperl2c jazzbkgd.gif
test/cmp Tag: Embperl2c epodiv.htm
test/conf Tag: Embperl2c httpd.conf.src
Log:
Sync Embperl 1 <-> 2
Revision Changes Path
No revision
No revision
1.118.4.15 +4 -3 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.14
retrieving revision 1.118.4.15
diff -u -r1.118.4.14 -r1.118.4.15
--- Embperl.pm 2000/11/15 11:55:25 1.118.4.14
+++ Embperl.pm 2000/12/04 09:17:32 1.118.4.15
@@ -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.14 2000/11/15 11:55:25 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.15 2000/12/04 09:17:32 richter Exp $
#
###################################################################################
@@ -88,7 +88,7 @@
##ep2##
$VERSION = '2.0a16' ;
##/ep2##
-##ep1##$VERSION = '1.3b7_dev';
+##ep1##$VERSION = '1.3b8_dev';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
# under mod_perl, because its dependencies import symbols like ap_palloc
@@ -174,6 +174,7 @@
use constant optDisableInputScan => 1024 ;
use constant optDisableMetaScan => 4096 ;
use constant optDisableTableScan => 2048 ;
+use constant optDisableSelectScan => 0x800000 ;
use constant optDisableVarCleanup => 1 ;
use constant optEarlyHttpHeader => 64 ;
use constant optOpcodeMask => 8 ;
@@ -1824,7 +1825,7 @@
*{"$package\:\:tabmode"} = \$HTML::Embperl::tabmode ;
*{"$package\:\:escmode"} = \$HTML::Embperl::escmode ;
*{"$package\:\:http_headers_out"} = \%HTML::Embperl::http_headers_out ;
- *{"$package\:\:req_rec"} = \$HTML::Embperl::req_rec if defined
($HTML::Embperl::req_rec) ;
+ *{"$package\:\:req_rec"} = \$HTML::Embperl::req_rec ; # if defined
($HTML::Embperl::req_rec) ;
##ep2##
*{"$package\:\:_ep_node"} = \$HTML::Embperl::_ep_node ;
##/ep2##
1.56.4.3 +8 -2 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.56.4.2
retrieving revision 1.56.4.3
diff -u -r1.56.4.2 -r1.56.4.3
--- Embperl.pod 2000/11/08 21:40:16 1.56.4.2
+++ Embperl.pod 2000/12/04 09:17:33 1.56.4.3
@@ -634,8 +634,12 @@
=item optDisableTableScan = 2048
-Disables processing of all table-related tags.
(<TABLE><TH><TR><TD><MENU><OL><SELECT><UL>)
+Disables processing of all table-related tags. (<TABLE><TH><TR><TD><MENU><OL><UL>)
+=item optDisableSelectScan = 8388608 (0x800000) (only 1.3b7 and above)
+
+Disables processing of the SELECT tag. (<SELECT>)
+
=item optDisableMetaScan = 4096
Disables processing of all meta tags. (<META HTTP-EQUIV>)
@@ -1754,7 +1758,6 @@
B<NOTE 2:> If you want to output binary data, you must set the escmode
to zero. (only 1.3b6 and above)
-
=over 4
=item B<$escmode = 3 (or 7)>
@@ -2644,6 +2647,9 @@
source ftp://ftp.akopia.com/pub/support/srpm/
binary redhat 6.0 ftp://ftp.akopia.com/pub/support/6.0/
binary redhat 6.1 ftp://ftp.akopia.com/pub/support/6.1/
+
+ PPM for ActiveState http://theoryx5.uwinnipeg.ca/ppmpackages/
+
=head2 CVS
1.29.4.3 +6 -1 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.29.4.2
retrieving revision 1.29.4.3
diff -u -r1.29.4.2 -r1.29.4.3
--- EmbperlD.pod 2000/11/08 21:40:19 1.29.4.2
+++ EmbperlD.pod 2000/12/04 09:17:33 1.29.4.3
@@ -577,8 +577,12 @@
=item optDisableTableScan = 2048
-Verhindert die Bearbeitung aller Tabellen Tags.
(<TABLE><TH><TR><TD><MENU><OL><SELECT><UL>)
+Verhindert die Bearbeitung aller Tabellen Tags. (<TABLE><TH><TR><TD><MENU><OL><UL>)
+=item optDisableSelectScan = 8388608 (0x800000) (ab 1.3b7)
+
+Verhindert die Bearbeitung aller SELECT Tags. (<SELECT>)
+
=item optDisableMetaScan = 4096
Verhindert die Bearbeitung aller Meta Tags. (<META HTTP-EQUIV>)
@@ -2615,6 +2619,7 @@
binary redhat 6.0 ftp://ftp.akopia.com/pub/support/6.0/
binary redhat 6.1 ftp://ftp.akopia.com/pub/support/6.1/
+ PPM f�r ActiveState http://theoryx5.uwinnipeg.ca/ppmpackages/
=head2 CVS
1.16.4.2 +27 -0 embperl/Faq.pod
Index: Faq.pod
===================================================================
RCS file: /home/cvs/embperl/Faq.pod,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- Faq.pod 2000/09/14 05:08:26 1.16.4.1
+++ Faq.pod 2000/12/04 09:17:33 1.16.4.2
@@ -683,7 +683,34 @@
automatically set the http header to be the same as the META HTTP-EQUIV.
+=head2 I get "Stack underflow"
+The problem often occurs, when you have a <table> tag in one file and a </table>
+tag in another file and you both include them in a main page (e.g. as header
+and footer). There are two workarounds for this problem:
+
+=over 4
+
+=item 1. Set optDisableTableScan
+
+This will avoid that Embperl takes any action on tables. You can disable/enable
+this (also multiple times) inside the page with
+
+ [- $optDisableTableScan = 1 -]
+
+If you put this at the top of your header/footer which you include with Execute,
+then the main page will still process dynamic tables.
+
+=item 2. Add a <table> as comment
+
+Add the following to the top of
+the footer document:
+
+ <!-- <table><tr><td> -->
+
+This will work also, because Embperl (1.x) will not scan for html comments
+
+=back
=head1 Common Questions
1.12.4.2 +4 -2 embperl/INSTALL.pod
Index: INSTALL.pod
===================================================================
RCS file: /home/cvs/embperl/INSTALL.pod,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- INSTALL.pod 2000/09/14 05:08:26 1.12.4.1
+++ INSTALL.pod 2000/12/04 09:17:34 1.12.4.2
@@ -22,7 +22,8 @@
- B<make install>
B<NOTE 1:> (only Embperl-1.2b1 or higher) For using session handling you need
-Apache::Session-0.17 or higher. If possible use Apache::Session 1.52 or higher.
+Apache::Session-1.00 or higher. If possible use Apache::Session 1.52 or higher.
+Starting with Embperl 1.3b7 Apache::Session 0.17 is B<NOT> supported anymore.
B<NOTE 2:> I<Embperl> runs without additional Perl modules, but the C<make test>
needs the following modules to work:
@@ -107,7 +108,8 @@
B<nmake install>
B<NOTE 1:> (only Embperl-1.2b1 or higher) For using session handling you need
-Apache::Session-0.17 or higher. If possible use Apache::Session 1.52 or higher.
+Apache::Session-1.00 or higher. If possible use Apache::Session 1.52 or higher.
+Starting with Embperl 1.3b7 Apache::Session 0.17 is B<NOT> supported anymore.
B<NOTE 2:> I<Embperl> runs without additional Perl modules, but the C<make test>
needs the following modules to work:
1.50.4.10 +4 -2 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.9
retrieving revision 1.50.4.10
diff -u -r1.50.4.9 -r1.50.4.10
--- MANIFEST 2000/11/15 08:11:27 1.50.4.9
+++ MANIFEST 2000/12/04 09:17:34 1.50.4.10
@@ -114,9 +114,11 @@
test/html/input.htm
test/html/var.htm
test/html/varerr.htm
+test/html/varepvar.htm
test/html/hidden.htm
test/html/java.htm
test/html/inputjava.htm
+test/html/heredoc.htm
test/html/tagscan.htm
test/html/tagscandisable.htm
test/html/inc.htm
@@ -151,7 +153,6 @@
test/html/exit.htm
test/html/exit2.htm
test/html/exit3.htm
-test/html/heredoc.htm
test/html/post.htm
test/html/upload.htm
test/html/nochdir/nochdir.htm
@@ -227,6 +228,7 @@
test/cmp/var.htm
test/cmp/varerr.htm
test/cmp/varerr.htm56
+test/cmp/varepvar.htm
test/cmp/hidden.htm
test/cmp/java.htm
test/cmp/inputjava.htm
@@ -235,7 +237,6 @@
test/cmp/Execute.htm
test/cmp/errpage.htm
test/cmp/tied.htm
-test/cmp/heredoc.htm
test/cmp/include.htm
test/cmp/includeerr1.htm
test/cmp/includeerr2.htm
@@ -262,6 +263,7 @@
test/cmp/exit.htm
test/cmp/exit2.htm
test/cmp/exit3.htm
+test/cmp/heredoc.htm
test/cmp/post.htm
test/cmp/upload.htm
test/cmp/npherr.htm
1.19.4.3 +2 -1 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.2
retrieving revision 1.19.4.3
diff -u -r1.19.4.2 -r1.19.4.3
--- embperl.h 2000/10/18 13:28:52 1.19.4.2
+++ embperl.h 2000/12/04 09:17:34 1.19.4.3
@@ -139,7 +139,8 @@
optKeepSrcInMemory = 0x80000,
optKeepSpaces = 0x100000,
optOpenLogEarly = 0x200000,
- optNoUncloseWarn = 0x400000
+ optNoUncloseWarn = 0x400000,
+ optDisableSelectScan = 0x800000
} ;
/*
1.37.4.2 +2 -2 embperl/epcmd.c
Index: epcmd.c
===================================================================
RCS file: /home/cvs/embperl/epcmd.c,v
retrieving revision 1.37.4.1
retrieving revision 1.37.4.2
diff -u -r1.37.4.1 -r1.37.4.2
--- epcmd.c 2000/09/26 19:31:58 1.37.4.1
+++ epcmd.c 2000/12/04 09:17:34 1.37.4.2
@@ -94,7 +94,7 @@
{ "/dl", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnDl ,
optDisableTableScan, 1 } ,
{ "/menu", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnMenu ,
optDisableTableScan, 1 } ,
{ "/ol", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnOl ,
optDisableTableScan, 1 } ,
- { "/select", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnSelect ,
optDisableTableScan, 1 } ,
+ { "/select", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnSelect ,
optDisableSelectScan, 1 } ,
{ "/table", HtmlEndtable, 0, 1, cmdTable, 0, 0, cnTable ,
optDisableTableScan, 1 } ,
{ "/textarea", HtmlEndtextarea, 0, 1, cmdTextarea, 0, 0, cnNop ,
optDisableInputScan, 1 } ,
{ "/tr", HtmlEndrow, 0, 1, cmdTablerow, 0, 0, cnTr ,
optDisableTableScan, 1 } ,
@@ -124,7 +124,7 @@
{ "meta", HtmlMeta, 0, 0, cmdNorm, 1, 0, cnNop ,
optDisableMetaScan , 1 } ,
{ "ol", HtmlTable, 1, 0, cmdTable, 1, 0, cnOl ,
optDisableTableScan, 1 } ,
{ "option", HtmlOption, 0, 0, cmdNorm, 1, 0, cnNop ,
optDisableInputScan, 1 } ,
- { "select", HtmlSelect, 1, 0, cmdTable, 1, 0, cnSelect ,
optDisableTableScan, 1 } ,
+ { "select", HtmlSelect, 1, 0, cmdTable, 1, 0, cnSelect ,
optDisableSelectScan, 1 } ,
{ "sub", CmdSub, 1, 0, cmdSub, 0, 0, cnNop , 0
, 0 } ,
{ "table", HtmlTable, 1, 0, cmdTable, 1, 0, cnTable ,
optDisableTableScan, 1 } ,
{ "textarea", HtmlTextarea, 1, 0, cmdTextarea, 1, 1, cnNop ,
optDisableInputScan, 1 } ,
1.4.2.18 +2 -0 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -u -r1.4.2.17 -r1.4.2.18
--- epcomp.c 2000/11/15 11:55:29 1.4.2.17
+++ epcomp.c 2000/12/04 09:17:35 1.4.2.18
@@ -1444,6 +1444,8 @@
}
else
{
+ //if ((rc = ReadInputFile (r)) != ok)
+ // return rc ;
if ((rc = ParseFile (r)) != ok)
{
return rc ;
1.4.2.6 +3 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- epdom.c 2000/11/02 08:45:21 1.4.2.5
+++ epdom.c 2000/12/04 09:17:35 1.4.2.6
@@ -1672,7 +1672,7 @@
tNode xOrgChild = xOldChild ;
tStringIndex n ;
- lprintf (pCurrReq, "rp1--> SVs=%d %s DomTree Old=%d\n", sv_count,
sText?sText:"<null>", Node_selfDomTree (Node_self (pDomTree, xOldChild))) ;
+ /* *** lprintf (pCurrReq, "rp1--> SVs=%d %s DomTree Old=%d\n", sv_count,
sText?sText:"<null>", Node_selfDomTree (Node_self (pDomTree, xOldChild))) ; */
Node_condClonePad (pDomTree, xOldChild) ;
pOldChild = Node_self (pDomTree, xOldChild) ;
@@ -1685,7 +1685,7 @@
pOldChild = Node_selfCloneNode (pDomTree, pOldChild, 0) ;
xOldChild = pOldChild -> xNdx ;
}
- lprintf (pCurrReq, "rp2--> DomTree New=%d\n", Node_selfDomTree (pOldChild)) ;
+ /* *** lprintf (pCurrReq, "rp2--> DomTree New=%d\n", Node_selfDomTree
(pOldChild)) ; */
DomTree_selfCheckpoint (pDomTree, xOrgChild, xOldChild) ;
@@ -1710,7 +1710,7 @@
if (n)
NdxStringFree (n) ;
- lprintf (pCurrReq, "rp<-- nText=%d sText=>%*.*s< nTextLen = %d SVs=%d\n",
pOldChild -> nText, nTextLen,nTextLen, sText?sText:"<null>", nTextLen, sv_count) ;
+ /* *** lprintf (pCurrReq, "rp<-- nText=%d sText=>%*.*s< nTextLen = %d
SVs=%d\n", pOldChild -> nText, nTextLen,nTextLen, sText?sText:"<null>", nTextLen,
sv_count) ; */
return xOldChild ;
}
1.75.4.15 +5 -1 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.14
retrieving revision 1.75.4.15
diff -u -r1.75.4.14 -r1.75.4.15
--- epmain.c 2000/11/15 07:21:52 1.75.4.14
+++ epmain.c 2000/12/04 09:17:35 1.75.4.15
@@ -3132,7 +3132,7 @@
/* */
/* ---------------------------------------------------------------------------- */
-static int ReadInputFile (/*i/o*/ register req * r)
+int ReadInputFile (/*i/o*/ register req * r)
{
int rc = ok ;
@@ -3305,7 +3305,11 @@
rc = StartOutput (r) ;
/* --- read input file or get input file from memory --- */
+#ifdef xxxEP2
+ if (rc == ok && r -> bEP1Compat)
+#else
if (rc == ok)
+#endif
rc = ReadInputFile (r) ;
if (rc == ok && r -> Buf.pBuf == NULL && r -> Buf.pFile -> nFilesize == 0)
1.70.4.23 +31 -12 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.22
retrieving revision 1.70.4.23
diff -u -r1.70.4.22 -r1.70.4.23
--- test.pl 2000/11/15 08:33:02 1.70.4.22
+++ test.pl 2000/12/04 09:17:36 1.70.4.23
@@ -84,6 +84,11 @@
'version' => 1,
'cgi' => 0,
},
+ 'varepvar.htm' => {
+ 'query_info' => 'a=1&b=2',
+ 'offline' => 0,
+ 'cgi' => 0,
+ },
'escape.htm' => {
repeat => 2,
},
@@ -466,7 +471,7 @@
$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_ab $opt_start $opt_kill $opt_showcookie
$opt_cache) ;
+ $opt_ddd $opt_gdb $opt_ab $opt_abpre $opt_abverbose $opt_start
$opt_kill $opt_showcookie $opt_cache) ;
{
local $^W = 0 ;
@@ -541,7 +546,7 @@
$ret = GetOptions ("offline|o", "ep1|1", "cgi|c", "cache|a", "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", "ab:s", "start", "kill", "showcookie") ;
+ "ddd", "gdb", "ab:s", "abverbose", "abpre", "start", "kill", "showcookie")
;
$opt_help = 1 if ($ret == 0) ;
@@ -607,7 +612,9 @@
# 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 "--ab <numreq|options> run test thru ApacheBench\n" ;
+ print "--abverbose show whole ab output\n" ;
+ print "--abpre prefetch first request\n" ;
print "--start start apache only\n" ;
print "--kill kill apache only\n" ;
print "--showcookie shows sent and received cookies\n" ;
@@ -1030,7 +1037,7 @@
$looptest = defined ($opt_loop)?1:0 ; # endless loop tests
$outfile .= ".$$" if ($opt_uniquefn) ;
-$defaultdebug = 0 if ($opt_quite) ;
+$defaultdebug = 1 if ($opt_quite) ;
$opt_ep1 = 0 if (!$EP2) ;
$EP1COMPAT = 1 if ($opt_ep1) ;
@@ -1061,7 +1068,10 @@
}
else
{
- @tests = @ARGV ;
+ @tests = () ;
+ @testdata = () ;
+ my $i = 0 ;
+ @testdata = map { push @tests, $i ; $i+=2 ; ($_ => {}) } @ARGV ;
}
}
@@ -1422,7 +1432,7 @@
}
}
- if ($EP2)
+ if ($EP2 && $opt_cache)
{
#############
#
@@ -1773,7 +1783,8 @@
(!$test -> {cgi} && ($test -> {offline} || $test ->
{modperl})))) ;
-
+ next if (defined ($opt_ab) && $test -> {'errors'}) ;
+
=pod
next if ($file =~ /\// && $loc eq $cgiloc) ;
next if ($file eq 'taint.htm' && $loc eq $cgiloc) ;
@@ -1857,10 +1868,18 @@
$file .= '-1' if ($opt_ep1 && -e "$page-1") ;
if (defined ($opt_ab))
{
+ $m = REQ ("$loc$locver", $file, $test -> {query_info}, $outfile,
$content, $upload, $test -> {cookie}) if ($opt_abpre) ;
+ $locver ||= '' ;
$opt_ab = 10 if (!$opt_ab) ;
- my $cmd = "ab -n $opt_ab
'http://$host:$port/$loc$locver/$file?$test->{query_info}'";
- print "$cmd\n" ;
- system ($cmd) and die "Cannot start ab ($!)" ;
+ my $cmd = "ab -n $opt_ab 'http://$host:$port/$loc$locver/$file" .
($test->{query_info}?"?$test->{query_info}'":"'") ;
+ print "$cmd\n" if ($opt_abverbose) ;
+
+ open AB, "$cmd|" or die "Cannot start ab ($!)" ;
+ while (<AB>)
+ {
+ print $_ if ($opt_abverbose || (/Requests/)) ;
+ }
+ close AB ;
}
else
{
@@ -1879,7 +1898,7 @@
CheckSVs ($loopcnt, $n) ;
}
- if (($m || '') ne 'ok' && $errcnt == 0)
+ if (($m || '') ne 'ok' && $errcnt == 0 && !$opt_ab)
{
$err = 1 ;
print "ERR:$m\n" ;
@@ -1901,7 +1920,7 @@
$err = CmpFiles ($outfile, $org) ;
}
- print "ok\n" unless ($err) ;
+ print "ok\n" unless ($err || $opt_ab) ;
$err = 0 if ($opt_ignoreerror) ;
last if ($err) ;
$n++ ;
No revision
No revision
1.1.2.1.6.2 +16 -1 embperl/eg/images/jazzbkgd.gif
<<Binary file>>
No revision
No revision
1.1.4.3 +1 -1 embperl/test/cmp/epodiv.htm
Index: epodiv.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epodiv.htm,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- epodiv.htm 2000/11/08 21:41:06 1.1.4.2
+++ epodiv.htm 2000/12/04 09:17:42 1.1.4.3
@@ -280,7 +280,7 @@
</tr>
</table>
-<P>1.3b7_dev<P>
+^<P>1\.3
<P>17<P>
<P>1<P>
No revision
No revision
1.24.4.4 +14 -4 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.3
retrieving revision 1.24.4.4
diff -u -r1.24.4.3 -r1.24.4.4
--- httpd.conf.src 2000/11/13 18:38:51 1.24.4.3
+++ httpd.conf.src 2000/12/04 09:17:43 1.24.4.4
@@ -48,8 +48,12 @@
SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
EOD
-print OFH "SetEnv EMBPERL_OPTIONS 0\n" if ($EPMODPERLVERSION >= 1.24) ;
+if ($^O eq 'MSWin32' && $EPMODPERLVERSION >= 1.24)
+ { # ActiveState workarounds...
+ print OFH "SetEnv EMBPERL_OPTIONS 0\n" ;
+ print OFH "SetEnv EMBPERL_ESCMODE 3\n" ;
+ }
if ($EPSESSIONVERSION)
{
@@ -341,6 +345,12 @@
Options ExecCGI
</Location>
+<Location /mp>
+SetHandler perl-script
+PerlHandler "sub { print 'Hello' }"
+Options ExecCGI
+</Location>
+
ErrorLog tmp/httpd.err.log
PidFile tmp/httpd.pid
AccessConfig conf/null
@@ -351,9 +361,9 @@
LockFile tmp/httpd.lock
<IfModule apache_ssl.c>
-SSLDisable
-SSLCacheServerPort gcache_port
-SSLCacheServerPath $EPAPACHESRC/modules/ssl/gcache
+SSLDisable
+SSLCacheServerPort gcache_port
+SSLCacheServerPath $EPAPACHESRC/modules/ssl/gcache
</IfModule>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
