diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-06-03 18:23:57 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-06-03 18:23:57 -0300 |
| commit | 913b2c700f630bf6b8d74c0fb675d05aaac9e6d6 (patch) | |
| tree | b45e1555d994437d09c2f83224e4b4b7e61ce133 /ext/json/php_json.h | |
| parent | 160b5b564cde00c6243381e225445fdce83a0997 (diff) | |
| parent | 60c5f9910fbc5bd21fca8a624c6486ad8a41273a (diff) | |
| download | php-git-913b2c700f630bf6b8d74c0fb675d05aaac9e6d6.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
- 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
- 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/json/php_json.h')
0 files changed, 0 insertions, 0 deletions