Ilia Alshanetsky 5709f7dd5b Merge branch '53' into 54 ...

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

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

..

events

- Year++

2012-01-01 13:15:04 +00:00

fastcgi.c

- Fixed bug #60629 (memory corruption when web server closed the fcgi fd)

2012-01-03 22:26:11 +00:00

fastcgi.h

- Fixed bug #60629 (memory corruption when web server closed the fcgi fd)

2012-01-03 22:26:11 +00: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

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

2011-10-08 21:04:10 +00: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

Missing ifdef here

2012-01-19 22:35:22 +00:00

fpm_conf.h

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

2011-10-08 21:04:10 +00: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 #55526 (Heartbeat causes a lot of unnecessary events)

2011-10-09 15:12:26 +00: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

- Backported from 5.4 branch:

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

fpm_log.h

- commit r312812 again (dropped in r312913):

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

fpm_main.c

Always restore PG(magic_quote_gpc) on request shutdown

2012-02-02 12:58:54 +00:00

fpm_php_trace.c

- Backported from 5.4 branch:

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

fpm_php_trace.h

…

fpm_php.c

- Backported from 5.4 branch:

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

fpm_php.h

- Backported FR #55181 from 5.4 branch (Enhance security by limiting access to user defined extensions)

2011-10-08 13:42:31 +00:00

fpm_process_ctl.c

- Removed C++ comment style

2011-11-19 12:16:47 +00: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

- Fixed bug #60659 (FPM does not clear auth_user on request accept)

2012-01-04 21:18:26 +00: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

- commit r312812 again (dropped in r312913):

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

fpm_scoreboard.h

- commit r312812 again (dropped in r312913):

2011-10-08 13:29:14 +00: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

- Backported from 5.4 branch:

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

fpm_signals.h

…

fpm_sockets.c

- Backported from 5.4 branch:

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

fpm_sockets.h

- Replaced shm_slots with a real scoreboard

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

fpm_status.c

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00: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

- Backported from 5.4 branch:

2011-10-08 14:04:09 +00: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 #55526 (Heartbeat causes a lot of unnecessary events)

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

fpm.h

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

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

zlog.c

- Backported FR #52052 from 5.4 branch (Added partial syslog support)

2011-10-08 13:35:03 +00:00

zlog.h

- Backported FR #52052 from 5.4 branch (Added partial syslog support)

2011-10-08 13:35:03 +00:00