richter 02/03/20 12:39:00
Modified: . Tag: Embperl2c Changes.pod MANIFEST epcomp.c
test.pl
Embperl/Syntax Tag: Embperl2c EmbperlHTML.pm HTML.pm
test/cmp2 Tag: Embperl2c input.htm
test/conf Tag: Embperl2c httpd.conf.src
Added: test/cmp Tag: Embperl2c hostconfig.htm hostconfig.htm.3
hostconfig.htm.4 hostconfig.htm.5
test/html Tag: Embperl2c hostconfig.htm
Log:
fix select & virt host test
Revision Changes Path
No revision
No revision
1.129.4.59 +5 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.58
retrieving revision 1.129.4.59
diff -u -r1.129.4.58 -r1.129.4.59
--- Changes.pod 20 Mar 2002 15:31:00 -0000 1.129.4.58
+++ Changes.pod 20 Mar 2002 20:38:58 -0000 1.129.4.59
@@ -13,8 +13,12 @@
objects was kept after the end of it's lifetime, which caused a
segfault.
- Don't do a path search when the filename starts with './'.
- - Fix segfault that occured when many nested sub's are used,
+ - Fixed segfault that occured when many nested sub's are used,
but only a low number of strings.
+ - Fixed a problem that <option> tags are not correctly selected, when
+ the <option> tag was inside a loop and the name of the <select>
+ tag was dynamicly generated.
+ - Added test for config directives inside of VirtualHost
=head1 2.0b6 (BETA) 13. Mar. 2002
1.50.4.43 +5 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.42
retrieving revision 1.50.4.43
diff -u -r1.50.4.42 -r1.50.4.43
--- MANIFEST 20 Mar 2002 07:49:35 -0000 1.50.4.42
+++ MANIFEST 20 Mar 2002 20:38:58 -0000 1.50.4.43
@@ -230,6 +230,10 @@
test/cmp/geturlsess.htm
test/cmp/heredoc.htm
test/cmp/hidden.htm
+test/cmp/hostconfig.htm
+test/cmp/hostconfig.htm.3
+test/cmp/hostconfig.htm.4
+test/cmp/hostconfig.htm.5
test/cmp/http.htm
test/cmp/i18n.htm
test/cmp/if.htm
@@ -415,6 +419,7 @@
test/html/getsess.htm
test/html/heredoc.htm
test/html/hidden.htm
+test/html/hostconfig.htm
test/html/http.htm
test/html/if.htm
test/html/ifperl.htm
1.4.2.96 +16 -5 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.95
retrieving revision 1.4.2.96
diff -u -r1.4.2.95 -r1.4.2.96
--- epcomp.c 12 Mar 2002 08:58:44 -0000 1.4.2.95
+++ epcomp.c 20 Mar 2002 20:38:58 -0000 1.4.2.96
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.95 2002/03/12 08:58:44 richter Exp $
+# $Id: epcomp.c,v 1.4.2.96 2002/03/20 20:38:58 richter Exp $
#
###################################################################################*/
@@ -1358,6 +1358,9 @@
tStringIndex nNdx ;
tEmbperlCmd * pCmd ;
tEmbperlCmd * pCmdHead ;
+ tEmbperlCmd * pCmdLast ;
+ tEmbperlCmd * pCmdNext ;
+ tEmbperlCmd * pCmdIter ;
tNodeData * pNode = Node_self (pDomTree, xNode) ;
tAttrData * pAttr ;
int nAttr = 0 ;
@@ -1378,7 +1381,7 @@
/* pCmd = NULL ; */
}
else
- pCmd = pCmdHead = NULL ;
+ pCmd = pCmdHead = pCmdLast = NULL ;
if (r -> Component.Config.bDebug & dbgCompile)
@@ -1448,10 +1451,11 @@
if ((rc = embperl_CompileCmd (r, pDomTree, pNode, pCmd, &nStartCodeOffset)) !=
ok)
return rc ;
pDomTree = DomTree_self (xDomTree) ; /* addr may have changed */
+ pCmdLast = pCmd ;
pCmd = pCmd -> pNext ;
}
- pCmd = pCmdHead ;
+ pCmd = pCmdLast ;
if (pCmd)
if ((rc = embperl_CompilePostProcess (r, pDomTree, pNode, pCmd,
nCheckpointCodeOffset, nCheckpointArrayOffset, bCheckpointPending)) != ok)
return rc ;
@@ -1481,8 +1485,15 @@
{
if ((rc = embperl_CompileCmdEnd (r, pDomTree, pNode, pCmd, nStartCodeOffset,
bCheckpointPending)) != ok)
return rc ;
- pCmd = pCmd -> pNext ;
- }
+ pCmdIter = pCmdHead ;
+ pCmdNext = NULL ;
+ while (pCmdIter && pCmdIter != pCmd)
+ {
+ pCmdNext = pCmdIter ;
+ pCmdIter = pCmdIter -> pNext ;
+ }
+ pCmd = pCmdNext ;
+ }
if (pCmdHead && pCmdHead -> nSwitchCodeType == 2)
{
1.70.4.131 +23 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.130
retrieving revision 1.70.4.131
diff -u -r1.70.4.130 -r1.70.4.131
--- test.pl 20 Mar 2002 07:49:35 -0000 1.70.4.130
+++ test.pl 20 Mar 2002 20:38:58 -0000 1.70.4.131
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.130 2002/03/20 07:49:35 richter Exp $
+# $Id: test.pl,v 1.70.4.131 2002/03/20 20:38:58 richter Exp $
#
###################################################################################
@@ -41,6 +41,7 @@
# msg =>
# app_handler_class =>
# input_escmode =>
+# portadd =>
@testdata = (
'ascii' => { },
@@ -264,6 +265,24 @@
'errors' => 1,
'cmpext' => '.2',
},
+ 'hostconfig.htm' => {
+ 'modperl' => 1,
+ },
+ 'hostconfig.htm' => {
+ 'modperl' => 1,
+ 'cmpext' => '.3',
+ 'portadd' => 3,
+ },
+ 'hostconfig.htm' => {
+ 'modperl' => 1,
+ 'cmpext' => '.4',
+ 'portadd' => 4,
+ },
+ 'hostconfig.htm' => {
+ 'modperl' => 1,
+ 'cmpext' => '.5',
+ 'portadd' => 5,
+ },
'include.htm' => {
'version' => 1,
},
@@ -2610,6 +2629,9 @@
$n_req++ ;
$t1 = 0 ; # Embperl::Clock () ;
$file .= '-1' if ($opt_ep1 && -e "$page-1") ;
+
+ $port = $EPPORT + ($test -> {portadd} || 0) ;
+
if (defined ($opt_ab))
{
$m = REQ ("$loc$locver", $file, $test -> {query_info}, $outfile,
$content, $upload, $test -> {cookie}, $test -> {respheader}) if ($opt_abpre) ;
No revision
No revision
1.1.2.12 +19 -6 embperl/Embperl/Syntax/Attic/EmbperlHTML.pm
Index: EmbperlHTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlHTML.pm,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- EmbperlHTML.pm 20 Mar 2002 15:31:00 -0000 1.1.2.11
+++ EmbperlHTML.pm 20 Mar 2002 20:38:59 -0000 1.1.2.12
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlHTML.pm,v 1.1.2.11 2002/03/20 15:31:00 richter Exp $
+# $Id: EmbperlHTML.pm,v 1.1.2.12 2002/03/20 20:38:59 richter Exp $
#
###################################################################################
@@ -114,21 +114,34 @@
stackname2 => 'htmlselect',
push2 => '%&*\'name%',
- perlcode => 'l%$p%: { my $_ep_selectname=%&*\'name%;print
"epsel=$_ep_selectname\n" ; for (my $row = 0; $row < $maxrow; $row++) {' ,
- perlcodeend => '}} %?*-htmltable%' ,
+ perlcode => 'l%$p%: for (my $row = 0; $row < $maxrow; $row++) {'
,
+ perlcodeend => '} %?*-htmltable%' ,
perlcoderemove => 1,
stackname => 'htmltable',
'push' => '%$p%',
mayjump => 1,
- }) ;
+ },
+ {
+ procinfo =>
+ {
+ 'embperl#2' =>
+ {
+ perlcode => '{ my $_ep_selectname=%&*\'name%;',
+ perlcodeend => '} %&*-name%',
+ stackname => 'htmltable',
+ 'push' => '%$p%',
+ }
+ }
+ }
+ ) ;
# option tag are _not_ added as block, to allow <option> without </option>
# which are interpreted correct by most browsers
$self -> AddTag ('option', ['value'], undef, ['selected'],
{
perlcode =>
[
- '_ep_opt (%$n%, $_ep_selectname, %&*\'value%, %&\'selected%);
print "epselo=$_ep_selectname\n" ;',
- '_ep_opt (%$n%, $_ep_selectname, %>*\'1%, %&\'selected%);print
"epselo=$_ep_selectname\n" ;',
+ '_ep_opt (%$n%, $_ep_selectname, %&*\'value%, %&\'selected%);',
+ '_ep_opt (%$n%, $_ep_selectname, %>*\'1%, %&\'selected%);',
#'_ep_opt (%$n%, %^*htmlselect%, %&*\'value%, %&\'selected%);',
#'_ep_opt (%$n%, %^*htmlselect%, %>*\'1%, %&\'selected%);',
]
1.1.2.18 +2 -2 embperl/Embperl/Syntax/Attic/HTML.pm
Index: HTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/HTML.pm,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- HTML.pm 15 Mar 2002 19:53:56 -0000 1.1.2.17
+++ HTML.pm 20 Mar 2002 20:38:59 -0000 1.1.2.18
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: HTML.pm,v 1.1.2.17 2002/03/15 19:53:56 richter Exp $
+# $Id: HTML.pm,v 1.1.2.18 2002/03/20 20:38:59 richter Exp $
#
###################################################################################
@@ -81,7 +81,7 @@
'unescape' => 1,
(ref($taginfo) eq 'HASH'?%$taginfo:()),
} ;
- $tag -> {'procinfo'} = { $self -> {-procinfotype} => $procinfo } if ($procinfo)
;
+ $tag -> {'procinfo'} = { $self -> {-procinfotype} => $procinfo, (ref($taginfo)
eq 'HASH'?%{$taginfo->{procinfo}}:()) } if ($procinfo) ;
my %inside = %{$self -> {-htmlQuotes}} ;
my $addinside = 0 ;
No revision
No revision
1.1.2.1 +14 -0 embperl/test/cmp/Attic/hostconfig.htm
1.1.2.1 +14 -0 embperl/test/cmp/Attic/hostconfig.htm.3
1.1.2.1 +14 -0 embperl/test/cmp/Attic/hostconfig.htm.4
1.1.2.1 +14 -0 embperl/test/cmp/Attic/hostconfig.htm.5
No revision
No revision
1.1.2.10 +19 -0 embperl/test/cmp2/Attic/input.htm
Index: input.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/input.htm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- input.htm 27 Feb 2002 08:19:43 -0000 1.1.2.9
+++ input.htm 20 Mar 2002 20:38:59 -0000 1.1.2.10
@@ -266,6 +266,25 @@
<option value="Wert8">Wert8</option>
</select>
+ <select name="feld5">
+ <option value="Wert1">Wert1</option>
+
+ <option value="Wert2">Wert2</option>
+
+ <option value="Wert3">Wert3</option>
+
+ <option value="Wert4">Wert4</option>
+
+ <option value="Wert5" selected>Wert5</option>
+
+ <option value="Wert6">Wert6</option>
+
+ <option value="Wert7">Wert7</option>
+
+ <option value="Wert8">Wert8</option>
+ </select>
+
+
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert2" name="mult">
No revision
No revision
1.24.4.58 +40 -5 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.57
retrieving revision 1.24.4.58
diff -u -r1.24.4.57 -r1.24.4.58
--- httpd.conf.src 18 Mar 2002 20:23:46 -0000 1.24.4.57
+++ httpd.conf.src 20 Mar 2002 20:38:59 -0000 1.24.4.58
@@ -26,6 +26,10 @@
EOD
}
+print OFH "Listen ", $EPPORT , "\n" ;
+print OFH "Listen ", $EPPORT + 3, "\n" ;
+print OFH "Listen ", $EPPORT + 4, "\n" ;
+print OFH "Listen ", $EPPORT + 5, "\n" ;
print OFH <<EOD ;
@@ -64,9 +68,12 @@
ResourceConfig conf/null
TypesConfig conf/null
LockFile tmp/httpd.lock
-
-# needs mod_log_config
-#CustomLog tmp/httpd.acc.log std
+
+
+# needs mod_log_config
+
+#CustomLog tmp/httpd.acc.log std
+
#LogFormat \"%h %l %u %t \\"%r\\" %s %b %{connection}o pid=%P %Tsec\" std
@@ -74,7 +81,7 @@
-if ($EPSESSIONXVERSION && ($EPSESSIONXVERSION > 1))
+if ($EPSESSIONXVERSION)
{
print OFH <<EOD ;
@@ -339,7 +346,35 @@
EMBPERL_MAIL_ERRORS_RESEND_TIME 60
</Location>
+EOD
+
+print OFH "<VirtualHost _default_:", $EPPORT + 3, ">\n" ;
+print OFH <<EOD ;
+EMBPERL_APPNAME VirtHost1
+EMBPERL_INPUT_ESCMODE 15
+</VirtualHost>
+EOD
+
+print OFH "<VirtualHost _default_:", $EPPORT + 4, ">\n" ;
+print OFH <<EOD ;
+EMBPERL_APPNAME VirtHost2
+EMBPERL_INPUT_ESCMODE 31
+EMBPERL_OBJECT_BASE p4
+</VirtualHost>
+
+EOD
+
+print OFH "<VirtualHost _default_:", $EPPORT + 5, ">\n" ;
+print OFH <<EOD ;
+EMBPERL_INPUT_ESCMODE 63
+EMBPERL_OBJECT_BASE p5
+</VirtualHost>
+
+EOD
+
+
+print OFH <<EOD ;
### CGI setup ###
Alias /cgi-bin/uidurl/ \"$EPPATH/test/html/sidurl/\"
@@ -354,7 +389,7 @@
Options ExecCGI
EOD
-if ($EPSESSIONXVERSION && ($EPSESSIONXVERSION > 1))
+if ($EPSESSIONXVERSION)
{
print OFH <<EOD ;
No revision
No revision
1.1.2.1 +7 -0 embperl/test/html/Attic/hostconfig.htm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
