[PHP-CVS] com php-src: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4: NEWS-5.4

2013-03-03 Thread Anatol Belski 
Commit:d95faef1a10df8db5ce622d6495733495d562430
Author:Anatol Belski a...@php.net Sun, 3 Mar 2013 19:22:35 +0100
Parents:   00ecc12c0fb86f3f4c03d55e1ae0fe1e417acea6 
6c2564766f9260ceecf3f963ce79a150cea9b0ac
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue 
with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue 
with NEWS files.

Changed paths:
  AM  NEWS-5.4


Diff: Diff exceeded maximum size

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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4: NEWS

2012-03-21 Thread Dmitry Stogov 
Commit:09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0
Author:Dmitry Stogov dmi...@zend.com Wed, 21 Mar 2012 16:51:24 
+0400
Parents:   a8cc0b05b45110ccf408ea9410447bf82b8826f2 
0f001703a8987960de041b216a023869ab439857
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Changed paths:
  MM  NEWS


Diff:
09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0
diff --combined NEWS
index ed26589,530159c..cc2de2e
--- a/NEWS
+++ b/NEWS
@@@ -73,8 -73,6 +73,8 @@@ PH
  User-Agent header). (carloschilazo at gmail dot com)
. Fixed bug #60842, #51775 (Chunked response parsing error when 
  chunksize length line is  10 bytes). (Ilia)
 +  . Fixed bug #49853 (Soap Client stream context header option ignored).
 +(Dmitry)
  
  - PDO
. Fixed bug #61292 (Segfault while calling a method on an overloaded PDO 
@@@ -98,6 -96,8 +98,8 @@@
  ReflectionMethod::invokeArgs()). (Laruence)
  
  - SPL:
+   . Fixed bug #61453 (SplObjectStorage does not identify objects correctly).
+ (Gustavo)
. Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
  
  - Standard:


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