diff options
author | Felipe Pena <felipensp@gmail.com> | 2012-06-03 18:20:26 -0300 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2012-06-03 18:20:26 -0300 |
commit | 60c5f9910fbc5bd21fca8a624c6486ad8a41273a (patch) | |
tree | 70838043ee12a4002b50cf5b2ba7c39a73beb411 /ext/intl/breakiterator/breakiterator_methods.cpp | |
parent | 1fa8ecd082607858084994ad7081ef06e37db5f5 (diff) | |
parent | d57b278ad1f490094b0c3331cf02312b785a8a78 (diff) | |
download | php-git-60c5f9910fbc5bd21fca8a624c6486ad8a41273a.tar.gz |
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
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions