]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit60c5f9910fbc5bd21fca8a624c6486ad8a41273a
tree70838043ee12a4002b50cf5b2ba7c39a73beb411tree | snapshot
parent1fa8ecd082607858084994ad7081ef06e37db5f5commit | diff
parentd57b278ad1f490094b0c3331cf02312b785a8a78commit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* 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
Zend/zend_operators.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.