richter at apache
Jan 22, 2004, 12:51 PM
Post #1 of 1
(570 views)
Permalink
|
|
cvs commit: embperl/test/html crypto.htm
|
|
richter 2004/01/22 11:51:12
Modified: . Changes.pod TODO epdom.c test.pl
test/cmp escape.htm
test/cmp2 binary.htm
test/html crypto.htm
Log:
fix dl nesting bug
Revision Changes Path
1.218 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- Changes.pod 16 Jan 2004 08:24:26 -0000 1.217
+++ Changes.pod 22 Jan 2004 19:51:12 -0000 1.218
@@ -15,6 +15,8 @@
- Fixed problem with mod_perl 1.99_12 which reports wrong return value from
handler when some variable inside them Embperl page get tainted.
- Fixed tests for Perl 5.8.2
+ - Fixed a bug with print OUT at the end of a nested tag inside a loop reported
+ by Neil Gunton
=head1 2.0b9 10. Juni 2003
1.114 +1 -2 embperl/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/embperl/TODO,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- TODO 22 Jan 2004 05:59:11 -0000 1.113
+++ TODO 22 Jan 2004 19:51:12 -0000 1.114
@@ -1,8 +1,6 @@
TODO before Embperl 2.0 release
-- DL nesting problem and print OUT [Neil Gunton 2.7.2003]
-
- print OUT and sub [Carlos 3.7.2003]
- include at top of every file [Kee Hinckley 3.8.2003]
@@ -14,3 +12,4 @@
TODO for Embperl 2.1 and later
+- make Embperl run with threads and threaded Apache 2
\ No newline at end of file
1.13 +25 -4 embperl/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/epdom.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- epdom.c 22 Jan 2004 05:59:11 -0000 1.12
+++ epdom.c 22 Jan 2004 19:51:12 -0000 1.13
@@ -2928,12 +2928,25 @@
if (pNxtNode)
pNxtNode = Node_selfCondCloneNode (a, pRefNodeDomTree, pNxtNode, nRefRepeatLevel) ;
else
- pNxtNode = Node_selfLevel (a, pRefNodeDomTree, pRefNode -> xNext, nRefRepeatLevel) ; /* first one */
+ {
+ tNodeData * pParent ;
+
+ if ((pParent = Node_selfLevel (a, pRefNodeDomTree, pRefNode -> xParent, nRefRepeatLevel)) == NULL ||
+ pParent -> xChilds != pRefNode -> xNext)
+ pNxtNode = Node_selfLevel (a, pRefNodeDomTree, pRefNode -> xNext, nRefRepeatLevel) ; /* first one */
+ else
+ pNxtNode = NULL ;
+ }
- pNxtNode -> xPrev = pNew -> xNdx ;
+ if (pNxtNode)
+ {
+ pNxtNode -> xPrev = pNew -> xNdx ;
+ pNew -> xNext = pNxtNode -> xNdx ;
+ }
+ else
+ pNew -> xNext = pRefNode -> xNext ;
pRefNode -> xNext = pNew -> xNdx ;
pNew -> xPrev = pRefNode -> xNdx ;
- pNew -> xNext = pNxtNode -> xNdx ;
return pNew -> xNdx ;
}
@@ -3094,6 +3107,14 @@
else
pNxt = Node_selfLevel (a, pDomTree, pNode -> xNext, nRepeatLevel) ;
+ /*
+ if (pParent && pNxt -> nRepeatLevel)
+ {
+ if (pParent -> xChilds == xNode_selfLevelNull(pDomTree,pNxt) )
+ return NULL ;
+ }
+ */
+
if (!pParent)
{
if (pNxt -> nType == ntypDocumentFraq)
1.130 +3 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- test.pl 9 Jun 2003 18:03:22 -0000 1.129
+++ test.pl 22 Jan 2004 19:51:12 -0000 1.130
@@ -216,7 +216,8 @@
'version' => 1, # needs print OUT
},
'nesting.htm' => {
- 'version' => 1,
+ },
+ 'nesting2.htm' => {
},
'object.htm' => {
'version' => 1,
1.27 +2 -2 embperl/test/cmp/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/escape.htm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- escape.htm 24 Feb 2003 07:23:02 -0000 1.26
+++ escape.htm 22 Jan 2004 19:51:12 -0000 1.27
@@ -42,10 +42,10 @@
IMG: <IMG SRC="http://localhost/tests?id=abcdefghijklmnopqrstuvwxyz&text=This%20is%20a%20text%20%3F%20%26%20%2B%20-%20%2521" name="%20foo">
FORM: <FORM action="http://localhost/tests?id=abcdefghijklmnopqrstuvwxyz&text=This%20is%20a%20text%20%3F%20%26%20%2B%20-%20%2521" name="%20foo">
-Hash in A <a href="http://localhost/tests?A=1&B=2">
+^Hash in A <a href="http:\/\/localhost\/tests\?(A=1&B=2|B=2&A=1)">
Array in A <a href="http://localhost/tests?X=9&Y=8&Z=7">
-Hash in H <a href="http://localhost/tests?A=1&B=2">
+^Hash in H <a href="http:\/\/localhost\/tests\?(A=1&B=2|B=2&A=1)">
^Array in H \<a href\=\"http\:\/\/localhost\/tests\?(X=9&Y=8&Z=7)|(Z=7&X=9&Y=8)\"\>
^<a href="tst.html\?(par1=1&par2=2)|(par2=2&par1=1)">1</a>
1.2 +1 -2 embperl/test/cmp2/binary.htm
<<Binary file>>
1.2 +1 -6 embperl/test/html/crypto.htm
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
