[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Nov 29 01:31:37 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2882r2=1.2883diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2882 php-src/ChangeLog:1.2883 --- php-src/ChangeLog:1.2882Wed Nov 28 01:31:35 2007 +++ php-src/ChangeLog Thu Nov 29 01:31:36 2007 @@ -1,3 +1,58 @@ +2007-11-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation5.phpt + ext/standard/tests/array/array_combine_variation5.phpt: + + MFB: Fixed tests + +* (PHP_5_3) + ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation5.phpt: + + Fixed tests + +2007-11-28 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/dom/document.c + ext/dom/document.c + ext/dom/tests/bug43364.phpt + ext/dom/tests/bug43364.phpt: + MFH: Fix bug #43364 (recursive xincludes don't remove internal nodes + properly) + add test + +* ext/dom/tests/bug43364.phpt + ext/dom/tests/bug43364.phpt + ext/dom/tests/bug43364.phpt: +1.1.4; + Fix bug #43364 (recursive xincludes don't remove internal nodes properly) + +* ext/dom/document.c: + Fix bug #43364 (recursive xincludes don't remove internal nodes properly) + +2007-11-28 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation3.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation4.phpt + ext/standard/tests/array/array_combine_variation5.phpt + ext/standard/tests/array/array_combine_variation5.phpt + ext/standard/tests/array/array_combine_variation5.phpt: + Marked with defect + 2007-11-27 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src /ext/dom document.c /ext/dom/tests bug43364.phpt
rrichards Wed Nov 28 10:43:02 2007 UTC
Added files:
/php-src/ext/dom/tests bug43364.phpt
Modified files:
/php-src/ext/domdocument.c
Log:
Fix bug #43364 (recursive xincludes don't remove internal nodes properly)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.88 php-src/ext/dom/document.c:1.89
--- php-src/ext/dom/document.c:1.88 Sun Oct 7 05:15:03 2007
+++ php-src/ext/dom/document.c Wed Nov 28 10:43:01 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.88 2007/10/07 05:15:03 davidw Exp $ */
+/* $Id: document.c,v 1.89 2007/11/28 10:43:01 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1767,6 +1767,10 @@
/* XML_XINCLUDE_END node will be a sibling of
XML_XINCLUDE_START */
while(cur cur-type != XML_XINCLUDE_END) {
+ /* remove xinclude processing nodes from
recursive xincludes */
+ if (cur-type == XML_ELEMENT_NODE) {
+
php_dom_remove_xinclude_nodes(cur-children TSRMLS_CC);
+ }
cur = cur-next;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug43364.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug43364.phpt
+++ php-src/ext/dom/tests/bug43364.phpt
--TEST--
Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
--FILE--
?php
function loopElements($nodes)
{
$count = 0;
foreach($nodes as $node) {
if($node instanceof DOMElement) {
$count++;
if($node-childNodes-length 0) {
$count += loopElements($node-childNodes);
}
}
}
return $count;
}
$xml = DOC
?xml version=1.0 encoding=UTF-8?
root xmlns:xi=http://www.w3.org/2001/XInclude;
a
a_child1ac1/a_child1
a_child2ac2/a_child2
/a
bxi:include xpointer=xpointer(/root/a) //b
cxi:include xpointer=xpointer(/root/b) //c
/root
DOC;
$doc = new DomDocument();
$doc-loadXml($xml);
$doc-xinclude();
$count = loopElements(array($doc-documentElement));
var_dump($count);
?
--EXPECT--
int(13)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom document.c /ext/dom/tests bug43364.phpt
rrichards Wed Nov 28 10:44:21 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests bug43364.phpt
Modified files:
/php-src/ext/domdocument.c
Log:
MFH: Fix bug #43364 (recursive xincludes don't remove internal nodes properly)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.2r2=1.68.2.3.2.5.2.3diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.2
php-src/ext/dom/document.c:1.68.2.3.2.5.2.3
--- php-src/ext/dom/document.c:1.68.2.3.2.5.2.2 Sun Oct 7 05:22:04 2007
+++ php-src/ext/dom/document.c Wed Nov 28 10:44:21 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.68.2.3.2.5.2.2 2007/10/07 05:22:04 davidw Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.5.2.3 2007/11/28 10:44:21 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1737,6 +1737,10 @@
/* XML_XINCLUDE_END node will be a sibling of
XML_XINCLUDE_START */
while(cur cur-type != XML_XINCLUDE_END) {
+ /* remove xinclude processing nodes from
recursive xincludes */
+ if (cur-type == XML_ELEMENT_NODE) {
+
php_dom_remove_xinclude_nodes(cur-children TSRMLS_CC);
+ }
cur = cur-next;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug43364.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug43364.phpt
+++ php-src/ext/dom/tests/bug43364.phpt
--TEST--
Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
--FILE--
?php
function loopElements($nodes)
{
$count = 0;
foreach($nodes as $node) {
if($node instanceof DOMElement) {
$count++;
if($node-childNodes-length 0) {
$count += loopElements($node-childNodes);
}
}
}
return $count;
}
$xml = DOC
?xml version=1.0 encoding=UTF-8?
root xmlns:xi=http://www.w3.org/2001/XInclude;
a
a_child1ac1/a_child1
a_child2ac2/a_child2
/a
bxi:include xpointer=xpointer(/root/a) //b
cxi:include xpointer=xpointer(/root/b) //c
/root
DOC;
$doc = new DomDocument();
$doc-loadXml($xml);
$doc-xinclude();
$count = loopElements(array($doc-documentElement));
var_dump($count);
?
--EXPECT--
int(13)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom document.c /ext/dom/tests bug43364.phpt
rrichards Wed Nov 28 10:45:16 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests bug43364.phpt
Modified files:
/php-src/ext/domdocument.c
Log:
MFH: Fix bug #43364 (recursive xincludes don't remove internal nodes properly)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5r2=1.68.2.3.2.6diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.5
php-src/ext/dom/document.c:1.68.2.3.2.6
--- php-src/ext/dom/document.c:1.68.2.3.2.5 Mon Jan 1 09:36:00 2007
+++ php-src/ext/dom/document.c Wed Nov 28 10:45:16 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.68.2.3.2.5 2007/01/01 09:36:00 sebastian Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.6 2007/11/28 10:45:16 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1737,6 +1737,10 @@
/* XML_XINCLUDE_END node will be a sibling of
XML_XINCLUDE_START */
while(cur cur-type != XML_XINCLUDE_END) {
+ /* remove xinclude processing nodes from
recursive xincludes */
+ if (cur-type == XML_ELEMENT_NODE) {
+
php_dom_remove_xinclude_nodes(cur-children TSRMLS_CC);
+ }
cur = cur-next;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug43364.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug43364.phpt
+++ php-src/ext/dom/tests/bug43364.phpt
--TEST--
Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
--FILE--
?php
function loopElements($nodes)
{
$count = 0;
foreach($nodes as $node) {
if($node instanceof DOMElement) {
$count++;
if($node-childNodes-length 0) {
$count += loopElements($node-childNodes);
}
}
}
return $count;
}
$xml = DOC
?xml version=1.0 encoding=UTF-8?
root xmlns:xi=http://www.w3.org/2001/XInclude;
a
a_child1ac1/a_child1
a_child2ac2/a_child2
/a
bxi:include xpointer=xpointer(/root/a) //b
cxi:include xpointer=xpointer(/root/b) //c
/root
DOC;
$doc = new DomDocument();
$doc-loadXml($xml);
$doc-xinclude();
$count = loopElements(array($doc-documentElement));
var_dump($count);
?
--EXPECT--
int(13)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
rrichards Wed Nov 28 10:47:37 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1019r2=1.2027.2.547.2.1020diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1019 php-src/NEWS:1.2027.2.547.2.1020 --- php-src/NEWS:1.2027.2.547.2.1019Tue Nov 27 17:14:27 2007 +++ php-src/NEWSWed Nov 28 10:47:36 2007 @@ -4,6 +4,8 @@ - Fixed bug #43386 (array_globals not reset to 0 properly on init). (Ilia) - Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone). (Ilia) - Fixed bug #43373 (pcntl_fork() should not raise E_ERROR on error). (Ilia) +- Fixed bug #43364 (recursive xincludes don't remove internal xml nodes + properly). (Rob, patch from [EMAIL PROTECTED]) - Fixed bug #43092 (curl_copy_handle() crashes with 32 chars long URL). (Jani) - Fixed bug #43301 (mb_ereg*_replace() crashes when replacement string is -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail loginfo
Hello Wez,
please remove this from PHP. PHP is open source, making this closed and
bringing in patents at the end makes me very angry. This has absolutely
nothing to do inside PHP.
marcus
Tuesday, November 27, 2007, 7:53:17 PM, you wrote:
wez Tue Nov 27 18:53:17 2007 UTC
Modified files:
/CVSROOTavail loginfo
Log:
karma and ml for some pdo bits
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1331r2=1.1332diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1331 CVSROOT/avail:1.1332
--- CVSROOT/avail:1.1331Mon Nov 26 15:14:40 2007
+++ CVSROOT/avail Tue Nov 27 18:53:17 2007
@@ -313,6 +313,10 @@
avail|ramsey|pecl/uploadprogress
avail|ramsey|pecl/pdo_user
+# PDO Specs. CLA required to commit
+unavail||pdo-specs
+avail|wez,andi,stas,iliaa|pdo-specs
+
# preprocessor karma
avail|merlin|pecl/preprocessor
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.126r2=1.127diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.126 CVSROOT/loginfo:1.127
--- CVSROOT/loginfo:1.126 Sun Nov 4 16:28:09 2007
+++ CVSROOT/loginfo Tue Nov 27 18:53:17 2007
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.126 2007/11/04 16:28:09
wez Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.127 2007/11/27 18:53:17
wez Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -138,6 +138,8 @@
^smarty-web$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^smarty$CVSROOT/CVSROOT/loginfo.pl
[EMAIL PROTECTED] $USER %{sVv}
+^pdo-specs $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+
DEFAULT$CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv}
#ALL $CVSROOT/CVSROOT/dolog.pl -r /repository [EMAIL PROTECTED]
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_combine_variation3.phpt array_combine_variation4.phpt array_combine_variation5.phpt
iliaa Wed Nov 28 14:49:20 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array array_combine_variation3.phpt
array_combine_variation4.phpt
array_combine_variation5.phpt
Log:
Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation3.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation3.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.1.2.3
php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.1.2.4
--- php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.1.2.3
Wed Nov 28 03:44:52 2007
+++ php-src/ext/standard/tests/array/array_combine_variation3.phpt Wed Nov
28 14:49:20 2007
@@ -95,9 +95,9 @@
}
-- Iteration 2 --
array(2) {
- [1]=
+ [1.1]=
float(1.1)
- [2]=
+ [2.2]=
float(2.2)
}
-- Iteration 3 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation4.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation4.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.1.2.3
php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.1.2.4
--- php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.1.2.3
Wed Nov 28 03:44:52 2007
+++ php-src/ext/standard/tests/array/array_combine_variation4.phpt Wed Nov
28 14:49:20 2007
@@ -146,7 +146,7 @@
int(111)
[color]=
string(5) color
- [2]=
+ [2.2]=
float(2.2)
[33]=
int(33)
@@ -157,7 +157,7 @@
int(111)
[color]=
string(5) color
- [2]=
+ [2.2]=
float(2.2)
[33]=
int(33)
@@ -178,7 +178,7 @@
array(6) {
[1]=
int(1)
- [2]=
+ [2.2]=
float(2.2)
[int]=
string(3) int
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation5.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation5.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.1.2.3
php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.1.2.4
--- php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.1.2.3
Wed Nov 28 03:44:52 2007
+++ php-src/ext/standard/tests/array/array_combine_variation5.phpt Wed Nov
28 14:49:20 2007
@@ -108,18 +108,18 @@
}
-- Iteration 5 --
array(1) {
- [2]=
+ [2.]=
float(2.)
}
-- Iteration 6 --
array(4) {
- [1]=
+ [1.2]=
float(1.2)
- [3]=
+ [3.33]=
float(3.33)
- [4]=
+ [4.892284]=
float(4.892284)
- []=
+ [.333]=
float(.333)
}
-- Iteration 7 --
@@ -176,7 +176,7 @@
resource(%d) of type (stream)
[133]=
int(133)
- [444]=
+ [444.432]=
float(444.432)
[]=
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_combine_variation3.phpt array_combine_variation4.phpt array_combine_variation5.phpt
iliaa Wed Nov 28 14:50:03 2007 UTC
Modified files:
/php-src/ext/standard/tests/array array_combine_variation3.phpt
array_combine_variation4.phpt
array_combine_variation5.phpt
Log:
MFB: Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation3.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation3.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.2
php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.3
--- php-src/ext/standard/tests/array/array_combine_variation3.phpt:1.2 Wed Nov
28 03:46:25 2007
+++ php-src/ext/standard/tests/array/array_combine_variation3.phpt Wed Nov
28 14:50:03 2007
@@ -96,9 +96,9 @@
}
-- Iteration 2 --
array(2) {
- [1]=
+ [1.1]=
float(1.1)
- [2]=
+ [2.2]=
float(2.2)
}
-- Iteration 3 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation4.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation4.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.2
php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.3
--- php-src/ext/standard/tests/array/array_combine_variation4.phpt:1.2 Wed Nov
28 03:46:25 2007
+++ php-src/ext/standard/tests/array/array_combine_variation4.phpt Wed Nov
28 14:50:03 2007
@@ -147,7 +147,7 @@
int(111)
[color]=
string(5) color
- [2]=
+ [2.2]=
float(2.2)
[33]=
int(33)
@@ -158,7 +158,7 @@
int(111)
[color]=
string(5) color
- [2]=
+ [2.2]=
float(2.2)
[33]=
int(33)
@@ -179,7 +179,7 @@
array(6) {
[1]=
int(1)
- [2]=
+ [2.2]=
float(2.2)
[int]=
string(3) int
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_combine_variation5.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/array/array_combine_variation5.phpt
diff -u php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.2
php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.3
--- php-src/ext/standard/tests/array/array_combine_variation5.phpt:1.2 Wed Nov
28 03:46:25 2007
+++ php-src/ext/standard/tests/array/array_combine_variation5.phpt Wed Nov
28 14:50:03 2007
@@ -108,18 +108,18 @@
}
-- Iteration 5 --
array(1) {
- [2]=
+ [2.]=
float(2.)
}
-- Iteration 6 --
array(4) {
- [1]=
+ [1.2]=
float(1.2)
- [3]=
+ [3.33]=
float(3.33)
- [4]=
+ [4.892284]=
float(4.892284)
- []=
+ [.333]=
float(.333)
}
-- Iteration 7 --
@@ -176,7 +176,7 @@
resource(%d) of type (stream)
[133]=
int(133)
- [444]=
+ [444.432]=
float(444.432)
[]=
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
