diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-05-29 12:19:20 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-05-29 12:19:20 +0200 |
| commit | c4f9b01422e8aa892624e811b9b329519185bcb4 (patch) | |
| tree | 13ac91a20da178c8f9e1b25870e0219e00405439 /ext/intl/timezone/timezone_methods.cpp | |
| parent | 158d8a6b088662ce9d31e0c777c6ebe90efdc854 (diff) | |
| parent | 4054890b26c4d146cfbcd56d75aab7a7aebc8c89 (diff) | |
| download | php-git-c4f9b01422e8aa892624e811b9b329519185bcb4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
sync with HEAD
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- add missing headers to avoid warnings
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
Conflicts:
NEWS
sapi/fpm/fpm/fpm_main.c
Diffstat (limited to 'ext/intl/timezone/timezone_methods.cpp')
0 files changed, 0 insertions, 0 deletions