Commit:    bde86a6639a661dcadb0ae4c3ce4cc8aca2a42b9
Author:    Xinchen Hui <larue...@php.net>         Thu, 24 May 2012 23:20:21 
+0800
Parents:   85c777d2f1d5a12fac0100f4953d33a7380d0b03 
9205c4fd62a769b7db3d00eccdf2ea35b20dd87f
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=bde86a6639a661dcadb0ae4c3ce4cc8aca2a42b9

Log:
Fixed bug #62073

(Different ways of iterating over an SplMaxHeap result in in different keys)

Bugs:
https://bugs.php.net/62073

Changed paths:
  MM  NEWS
  AM  ext/spl/tests/bug62073.phpt


Diff:
diff --cc NEWS
index 5fa6ecb,5f1146a..078725f
--- a/NEWS
+++ b/NEWS
@@@ -4,25 -4,6 +4,29 @@@ PH
  
  ?? ??? 2012, PHP 5.3.14
  
- - FPM
++- FPM:
 +  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
 +  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
 +  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
 +    for non-root start). (fat)
 +  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
 +
- - Intl
++- Intl:
 +  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
 +  . Fixed bug #62082 (memory corruption in internal get_icu_disp_value_src_php
 +    function). (Gustavo)
 +  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
 +    twice). (Gustavo)
 +  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
 +  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
 +    pattern). (Gustavo)
 +  . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
 +  . Fixed bug #55610 (ResourceBundle should implement Traversable). 
(stealth35)
 +
++- SPL:
++  . Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in
++    in different keys). (reeze....@gmail.com)
++
  - XML Writer:
    . Fixed bug #62064 (memory leak in the XML Writer module). 
      (jean-pierre dot lozi at lip6 dot fr)
@@@ -145,7 -126,7 +149,7 @@@
    . Fixed bug #60968 (Late static binding doesn't work with 
      ReflectionMethod::invokeArgs()). (Laruence)
  
--- SOAP
++- SOAP:
    . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
    . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
      User-Agent header). (carloschilazo at gmail dot com)
@@@ -154,7 -135,7 +158,7 @@@
    . Fixed bug #49853 (Soap Client stream context header option ignored).
      (Dmitry)
  
--- SPL
++- SPL:
    . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
    . Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
      FilesystemIterator's iterators are requested more than once without
diff --cc ext/spl/tests/bug62073.phpt
index 0000000,2472059..3bd3553
mode 000000,100644..100644
--- a/ext/spl/tests/bug62073.phpt
+++ b/ext/spl/tests/bug62073.phpt
@@@ -1,0 -1,24 +1,22 @@@
+ --TEST--
+ Bug #62073 (different ways of iterating over an SplMaxHeap result in 
different keys)
+ --FILE--
+ <?php
 -$heap = new SplMaxHeap;
++$heap = new SplMaxHeap();
+ $heap->insert(42);
+ foreach ($heap as $key => $value) {
 -  break;
++    var_dump($key);
++    var_dump($value);
++    break;
+ }
 -var_dump($key);
 -var_dump($value);
+ 
 -$heap = new SplMaxHeap;
++$heap = new SplMaxHeap();
+ $heap->insert(42);
+ var_dump($heap->key());
+ var_dump($heap->current());
+ ?>
 -==DONE==
+ --EXPECT--
+ int(0)
+ int(42)
+ int(0)
+ int(42)
 -==DONE==


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

Reply via email to