Xinchen Hui 2b6f06b70c Merge branch 'patch-1' of https://github.com/mickael9/php-src ...

* 'patch-1' of https://github.com/mickael9/php-src:
  fpm: call zend_signal_init() in child

2016-02-15 13:23:01 +08:00

..

events

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02: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

Fix naming

2015-11-13 15:01:10 +01:00

fpm_conf.h

Fix bug #68526 Implement POSIX Access Control List for UDS

2014-12-10 08:15:21 +01: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

trailing whitespace removal

2015-01-10 15:07:38 -08:00

fpm_env.h

- Fixed #52660 (custom process title for FPM)

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

fpm_events.c

Fix: fold-maker `fpm_event_pre_init()'

2015-10-22 23:21:46 +09: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 #70755: fpm_log.c memory leak and buffer overflow

2016-01-04 17:36:42 +01:00

fpm_log.h

first shot remove TSRMLS_* things

2014-12-13 23:06:14 +01:00

fpm_main.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-29 10:24:15 +01:00

fpm_php_trace.c

Use explicit type here

2015-05-12 16:35:57 +08:00

fpm_php_trace.h

…

fpm_php.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 13:59:27 +03:00

fpm_php.h

first shot remove TSRMLS_* things

2014-12-13 23:06:14 +01:00

fpm_process_ctl.c

trailing whitespace removal

2015-01-10 15:07:38 -08: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

- Fix merge

2015-02-16 12:21:20 -02:00

fpm_request.h

first shot remove TSRMLS_* things

2014-12-13 23:06:14 +01:00

fpm_scoreboard.c

trailing whitespace removal

2015-01-10 15:07:38 -08: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

fpm: call zend_signal_init() in child

2016-01-09 04:54:02 +01:00

fpm_signals.h

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

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

fpm_sockets.c

Treat NetBSD the same as FreeBSD wrt. TCP_INFO usage.

2015-03-19 09:39:54 +01:00

fpm_sockets.h

Merge branch 'pull-request/731'

2015-01-04 19:00:05 -08:00

fpm_status.c

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

2015-06-30 13:59:27 +03:00

fpm_status.h

first shot remove TSRMLS_* things

2014-12-13 23:06:14 +01:00

fpm_stdio.c

Factorization and consistency

2014-11-20 07:49:54 +01: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

trailing whitespace removal

2015-01-10 15:07:38 -08: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

Implemented fpm_trace for PHP7

2015-05-11 11:22:38 +08:00

fpm_trace.h

…

fpm_unix.c

trailing whitespace removal

2015-01-10 15:07:38 -08:00

fpm_unix.h

Fix bug #68526 Implement POSIX Access Control List for UDS

2014-12-10 08:15:21 +01:00

fpm_worker_pool.c

Fix bug #68526 Implement POSIX Access Control List for UDS

2014-12-10 08:15:21 +01:00

fpm_worker_pool.h

Fix bug #68526 Implement POSIX Access Control List for UDS

2014-12-10 08:15:21 +01:00

fpm.c

trailing whitespace removal

2015-01-10 15:07:38 -08:00

fpm.h

fix indentation

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

zlog.c

Fixed va_list double used

2015-05-25 15:40:32 +08:00

zlog.h

Fixed fpm-side (tests passes)

2015-05-23 19:01:41 +08:00