date:20110628

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS trunk/NEWS

2011-06-28 Thread Christopher Jones

sixd Tue, 28 Jun 2011 18:58:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=312581

Log:
clarify sqlite deprecation

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/trunk/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-06-28 18:55:37 UTC (rev 312580)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-06-28 18:58:07 UTC (rev 312581)
@@ -20,7 +20,8 @@
   . y2k_compliance ini option. (Kalle)

 - Moved extensions to PECL: (Johannes)
-  . ext/sqlite.
+  . ext/sqlite.  (Note: the ext/sqlite3 and ext/pdo_sqlite extensions are
+not affected)

 - Changed $_SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
 - Changed default value of "default_charset" php.ini option from ISO-8859-1 to

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2011-06-28 18:55:37 UTC (rev 312580)
+++ php/php-src/trunk/NEWS  2011-06-28 18:58:07 UTC (rev 312581)
@@ -19,7 +19,8 @@
   . y2k_compliance ini option. (Kalle)

 - Moved extensions to PECL: (Johannes)
-  . ext/sqlite.
+  . ext/sqlite.  (Note: the ext/sqlite3 and ext/pdo_sqlite extensions are
+not affected)

 - Changed $_SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
 - Changed default value of "default_charset" php.ini option from ISO-8859-1 to

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-28 Thread David Soria Parra

dsp  Tue, 28 Jun 2011 17:49:41 +

Revision: http://svn.php.net/viewvc?view=revision&revision=312578

Log:
give tyrael access to bugs as he works on it

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-28 17:18:07 UTC (rev 312577)
+++ SVNROOT/global_avail2011-06-28 17:49:41 UTC (rev 312578)
@@ -54,7 +54,7 @@

 
avail|salathe,scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa

-avail|degeberg|web/php-bugs
+avail|degeberg,tyrael|web/php-bugs
 avail|danielc|web/php
 avail|ericstewart|web/php/*/archive
 avail|odoucet|web/php-news/,web/qa/

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_iterators.c branches/PHP_5_3/ext/spl/tests/bug54971.phpt branches/PHP_5_4/ext/spl/spl_iterators.c branches/PHP_5_4/ext/s

2011-06-28 Thread Pierrick Charron

pierrick Tue, 28 Jun 2011 11:09:06 +

Revision: http://svn.php.net/viewvc?view=revision&revision=312564

Log:
Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on 
true)

Bug: http://bugs.php.net/54971 (unknown) 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/bug54971.phpt
U   php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c
A   php/php-src/branches/PHP_5_4/ext/spl/tests/bug54971.phpt
U   php/php-src/trunk/ext/spl/spl_iterators.c
A   php/php-src/trunk/ext/spl/tests/bug54971.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-06-28 11:03:16 UTC (rev 312563)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-06-28 11:09:06 UTC (rev 312564)
@@ -14,6 +14,9 @@
 - PDO ODBC driver:
   . Fixed data type usage in 64bit. (leocsilva at gmail dot com)

+- SPL extension:
+  . Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys
+on true). (Pierrick)

 16 Jun 2011, PHP 5.3.7 RC1
 - Upgraded bundled SQLite to version 3.7.6.3. (Scott)

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c2011-06-28 
11:03:16 UTC (rev 312563)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c2011-06-28 
11:09:06 UTC (rev 312564)
@@ -3306,6 +3306,7 @@
goto done;
}

+   iter->index = 0;
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
if (EG(exception)) {
@@ -3320,6 +3321,7 @@
if (apply_func(iter, puser TSRMLS_CC) == ZEND_HASH_APPLY_STOP 
|| EG(exception)) {
goto done;
}
+   iter->index++;
iter->funcs->move_forward(iter TSRMLS_CC);
if (EG(exception)) {
goto done;

Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug54971.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug54971.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug54971.phpt2011-06-28 
11:09:06 UTC (rev 312564)
@@ -0,0 +1,45 @@
+--TEST--
+Bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
+--FILE--
+
+val1
+val2
+
+XML;
+
+
+$doc = new DOMDocument();
+$doc->loadXML($source);
+
+$xpath = new DOMXPath($doc);
+$items = $xpath->query('//node');
+
+print_r(iterator_to_array($items, false));
+print_r(iterator_to_array($items, true));
+?>
+--EXPECT--
+Array
+(
+[0] => DOMElement Object
+(
+)
+
+[1] => DOMElement Object
+(
+)
+
+)
+Array
+(
+[0] => DOMElement Object
+(
+)
+
+[1] => DOMElement Object
+(
+)
+
+)

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c2011-06-28 
11:03:16 UTC (rev 312563)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c2011-06-28 
11:09:06 UTC (rev 312564)
@@ -3446,6 +3446,7 @@
goto done;
}

+   iter->index = 0;
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
if (EG(exception)) {
@@ -3460,6 +3461,7 @@
if (apply_func(iter, puser TSRMLS_CC) == ZEND_HASH_APPLY_STOP 
|| EG(exception)) {
goto done;
}
+   iter->index++;
iter->funcs->move_forward(iter TSRMLS_CC);
if (EG(exception)) {
goto done;

Added: php/php-src/branches/PHP_5_4/ext/spl/tests/bug54971.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/bug54971.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/bug54971.phpt2011-06-28 
11:09:06 UTC (rev 312564)
@@ -0,0 +1,45 @@
+--TEST--
+Bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
+--FILE--
+
+val1
+val2
+
+XML;
+
+
+$doc = new DOMDocument();
+$doc->loadXML($source);
+
+$xpath = new DOMXPath($doc);
+$items = $xpath->query('//node');
+
+print_r(iterator_to_array($items, false));
+print_r(iterator_to_array($items, true));
+?>
+--EXPECT--
+Array
+(
+[0] => DOMElement Object
+(
+)
+
+[1] => DOMElement Object
+(
+)
+
+)
+Array
+(
+[0] => DOMElement Object
+(
+)
+
+[1] => DOMElement Object
+(
+)
+
+)

Modified: php/php-src/trunk/ext/spl/spl_iterators.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/sockets/sockets.c trunk/ext/sockets/sockets.c

2011-06-28 Thread Gustavo André dos Santos Lopes

cataphract   Tue, 28 Jun 2011 10:27:29 +

Revision: http://svn.php.net/viewvc?view=revision&revision=312558

Log:
- Fixed socket_import_stream returning NULL on some errors and FALSE on others

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/sockets/sockets.c
U   php/php-src/trunk/ext/sockets/sockets.c

Modified: php/php-src/branches/PHP_5_4/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_4/ext/sockets/sockets.c  2011-06-28 09:38:55 UTC 
(rev 312557)
+++ php/php-src/branches/PHP_5_4/ext/sockets/sockets.c  2011-06-28 10:27:29 UTC 
(rev 312558)
@@ -2520,6 +2520,7 @@
 error:
if (retsock != NULL)
efree(retsock);
+   RETURN_FALSE;
 }
 /* }}} */


Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2011-06-28 09:38:55 UTC (rev 
312557)
+++ php/php-src/trunk/ext/sockets/sockets.c 2011-06-28 10:27:29 UTC (rev 
312558)
@@ -2520,6 +2520,7 @@
 error:
if (retsock != NULL)
efree(retsock);
+   RETURN_FALSE;
 }
 /* }}} */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS trunk/NEWS

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_iterators.c branches/PHP_5_3/ext/spl/tests/bug54971.phpt branches/PHP_5_4/ext/spl/spl_iterators.c branches/PHP_5_4/ext/s

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/sockets/sockets.c trunk/ext/sockets/sockets.c

4 matches

Site Navigation

Mail list logo

Footer information