Ferenc Kovacs 200e407b24 Merge branch 'PHP-5.5' into PHP-5.6 ...

* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm

2014-10-03 11:39:09 +02:00

..

events

Fix #66908: php-fpm reload leaks epoll_create() file descriptor

2014-04-20 16:21:49 -07:00

fastcgi.c

Bump year

2014-01-03 11:08:10 +08:00

fastcgi.h

Bump year

2014-01-03 11:08:10 +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

Typo fix: managment -> management

2013-10-19 23:53:23 +03: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

Merge branch 'PHP-5.5' into PHP-5.6

2014-06-27 09:51:15 +02:00

fpm_conf.h

add clear_env option to FPM config

2014-02-25 12:12:09 +04: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

add clear_env option to FPM config

2014-02-25 12:12:09 +04:00

fpm_env.h

- Fixed #52660 (custom process title for FPM)

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

fpm_events.c

Add --with-fpm-systemd option to report health to systemd, and

2013-05-21 09:49:00 +02: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

From code coverity scan, syscall return value must be check.

2013-05-03 08:19:14 +02:00

fpm_log.h

- commit r312812 again (dropped in r312913):

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

fpm_main.c

Merge branch 'PHP-5.5' into PHP-5.6

2014-09-15 13:31:26 +02:00

fpm_php_trace.c

Dont reset other counters when incrementing slow_rq

2013-02-20 18:53:17 +01: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

Dont reset other counters when incrementing slow_rq

2013-02-20 18:53:17 +01: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

From code coverity scan, syscall return value must be check.

2013-05-03 08:19:14 +02:00

fpm_signals.h

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

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

fpm_sockets.c

add IPv6 support to php-fpm

2014-10-03 11:35:27 +02:00

fpm_sockets.h

add IPv6 support to php-fpm

2014-10-03 11:35:27 +02: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

5.6 have fpm_globals.force_stderr

2014-07-08 08:33:48 +02: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_systemd.c

Add --with-fpm-systemd option to report health to systemd, and

2013-05-21 09:49:00 +02:00

fpm_systemd.h

Add --with-fpm-systemd option to report health to systemd, and

2013-05-21 09:49:00 +02: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

Merge branch 'PHP-5.5' into PHP-5.6

2014-04-29 09:16:24 -07:00

fpm_unix.h

…

fpm_worker_pool.c

From code coverity scan

2013-05-02 13:27:16 +02:00

fpm_worker_pool.h

From code coverity scan

2013-05-02 13:27:16 +02:00

fpm.c

fix indentation

2014-01-17 12:49:21 +04:00

fpm.h

fix indentation

2014-01-17 12:49:21 +04: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