[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/string.c

2013-01-08 Thread Xinchen Hui
Commit:15aaa9c6605b9ee5dfd568a13704f36a721433a0
Author:Xinchen Hui larue...@php.net Wed, 9 Jan 2013 10:54:23 +0800
Parents:   6e684e6a6ceac89ad51f822493f702a6925a2d37 
c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

Changed paths:
  MM  ext/standard/string.c


Diff:



--
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.3' into PHP-5.4: ext/standard/string.c

2012-08-19 Thread Felipe Pena
Commit:9d8d84ebdf8f59ecd6a256f5195fba8e877e611d
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:34:42 
-0300
Parents:   2497bb97e70aa8b7375c5a365b8d21a92357f262 
50ab6c63a700155b8d6be361eac29eae2bc6d869
Branches:  PHP-5.4 master

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

Changed paths:
  MM  ext/standard/string.c


Diff:



--
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.3' into PHP-5.4: ext/standard/string.c

2012-07-05 Thread Nikita Popov
Commit:5cf2f87fa78a01497f3e77fc0476a89904f1ead9
Author:Nikita Popov ni...@php.net Thu, 5 Jul 2012 20:59:18 +0200
Parents:   9a38ca8d5097c9cbebe21a56e64d3b331764b0be 
157ddd95773114c1148536b4b32fcbedf0c79b20
Branches:  PHP-5.4 master

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex

Conflicts:
ext/standard/string.c

Changed paths:
  MM  ext/standard/string.c


Diff:



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