Adam Harvey 142c40f32c Merge branch 'PHP-5.3' into PHP-5.4 ...

* PHP-5.3:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().

2013-01-16 10:18:00 +08:00

..

events

Happy New Year

2013-01-01 16:28:54 +08:00

fastcgi.c

Happy New Year

2013-01-01 16:28:54 +08:00

fastcgi.h

Happy New Year

2013-01-01 16:28:54 +08:00

fpm_arrays.h

…

fpm_atomic.h

- Replaced shm_slots with a real scoreboard

2011-06-26 15:48:11 +00:00

fpm_children.c

- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

2012-05-25 21:13:57 +02:00

fpm_children.h

- Replaced shm_slots with a real scoreboard

2011-06-26 15:48:11 +00:00

fpm_cleanup.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_cleanup.h

…

fpm_clock.c

- get rid of ZLOG_STUFF code redundancy

2010-11-11 21:38:18 +00:00

fpm_clock.h

…

fpm_conf.c

- Fixed bug #63085 (Systemd integration and daemonize)

2012-09-28 00:53:05 +02:00

fpm_conf.h

- Fixed bug #63085 (Systemd integration and daemonize)

2012-09-28 00:53:05 +02:00

fpm_config.h

- get rid of FPM_AUTOCONFIG_H which has never existed since FPM integration into core

2011-07-17 23:33:22 +00:00

fpm_env.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_env.h

- Fixed #52660 (custom process title for FPM)

2010-11-12 00:30:35 +00:00

fpm_events.c

Fixed Bug #63581 Possible null dereference

2012-11-28 10:28:18 +01:00

fpm_events.h

- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)

2011-10-08 21:04:10 +00:00

fpm_log.c

Fixed Bug #63581 Possible buffer overflow

2012-11-28 10:35:04 +01:00

fpm_log.h

- commit r312812 again (dropped in r312913):

2011-10-08 13:29:14 +00:00

fpm_main.c

Happy New Year

2013-01-01 16:28:54 +08:00

fpm_php_trace.c

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_php_trace.h

…

fpm_php.c

- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))

2012-06-01 11:23:01 +02:00

fpm_php.h

- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))

2012-06-01 11:23:01 +02:00

fpm_process_ctl.c

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_process_ctl.h

- Fixed bug #55526 (Heartbeat causes a lot of unnecessary events)

2011-10-09 15:12:26 +00:00

fpm_request.c

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_request.h

- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)

2011-10-08 21:04:10 +00:00

fpm_scoreboard.c

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_scoreboard.h

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_shm.c

Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).

2012-03-19 13:10:23 -04:00

fpm_shm.h

- fixed request_timeout and slowlog_timeout from last FPM commit (r312496)

2011-06-27 11:33:03 +00:00

fpm_signals.c

- Fixed bug #62954 (startup problems fpm / php-fpm)

2012-09-28 00:05:48 +02:00

fpm_signals.h

- Fixed bug #62954 (startup problems fpm / php-fpm)

2012-09-28 00:05:48 +02:00

fpm_sockets.c

Merging PR 121 to add support for slow request counting on the PHP-FPM status page

2012-08-26 17:02:39 +02:00

fpm_sockets.h

Update the arguments in the prototype of fpm_socket_unix_test_connect().

2013-01-16 10:06:56 +08:00

fpm_status.c

- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")

2012-09-28 01:25:51 +02:00

fpm_status.h

- Missing change

2011-06-18 17:46:16 +00:00

fpm_stdio.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_stdio.h

- Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed)

2010-11-26 13:46:15 +00:00

fpm_str.h

- remove cpystrn from FPM and use strlcpy instead.

2011-01-30 13:51:20 +00:00

fpm_trace_mach.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_trace_pread.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_trace_ptrace.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_trace.c

…

fpm_trace.h

…

fpm_unix.c

- Fixed bug #62947 (Unneccesary warnings on FPM)

2012-09-28 01:08:48 +02:00

fpm_unix.h

…

fpm_worker_pool.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00:00

fpm_worker_pool.h

- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)

2011-10-08 21:04:10 +00:00

fpm.c

- Fixed bug #63085 (Systemd integration and daemonize)

2012-09-28 00:53:05 +02:00

fpm.h

- Fixed bug #63085 (Systemd integration and daemonize)

2012-09-28 00:53:05 +02:00

zlog.c

- Fixed bug #61045 (fpm don't send error log to fastcgi clients)

2012-05-22 08:40:37 +02:00

zlog.h

- Fixed bug #61045 (fpm don't send error log to fastcgi clients)

2012-05-22 08:40:37 +02:00