]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fa8ecd d57b278)
Merge branch 'PHP-5.3' into PHP-5.4
authorFelipe Pena <felipensp@gmail.com>
Sun, 3 Jun 2012 21:20:26 +0000 (18:20 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 3 Jun 2012 21:20:26 +0000 (18:20 -0300)
* PHP-5.3:
  - Optimize comparison between same HashTable pointer
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings

1  2 
Zend/zend_operators.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_operators.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.