delta/php-git.git/sapi, branch php-5.4.17 git.php.net: repository/php-src.git Fix bug #64764: Add status option to fpm init.d script 2013-06-16T23:54:49+00:00 Lior Kaplan kaplanlior@gmail.com 2013-05-16T16:46:53+00:00 ee01af7df149da2c511b0f91db2e161eebb2bf58 






Merge branch 'pull-request/341'
2013-06-10T21:20:18+00:00

Stanislav Malyshev
stas@php.net

2013-06-10T21:20:18+00:00

ac40c0b562b0f90652cadef83968d7305626c377

* pull-request/341: (23 commits)
  typofixes





* pull-request/341: (23 commits)
  typofixes







typo fixes (argument)
2013-06-10T20:36:17+00:00

Veres Lajos
vlajos@gmail.com

2013-04-22T13:05:24+00:00

04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da












typo fixes (accommodate, parameter)
2013-06-10T20:36:03+00:00

Veres Lajos
vlajos@gmail.com

2013-04-22T12:41:27+00:00

ed2e84e2394b97f710710c6db0366d739422b0fe












Fixed Bug #64915 (error_log ignored when daemonize=0)
2013-05-24T10:09:05+00:00

Remi Collet
remi@php.net

2013-05-24T10:09:05+00:00

9f6ca9bc6400fc9c8eaebf963f6eb048dde4b34f

Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.





Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.







Add --with-fpm-systemd option to report health to systemd, and
2013-05-21T07:49:00+00:00

Remi Collet
remi@php.net

2013-05-21T07:49:00+00:00

0e99329e0aa8bbfe1b6d0ad06660630538118e2f

systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.





systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.







Merge branch 'PHP-5.3' into PHP-5.4
2013-05-03T06:22:55+00:00

Remi Collet
remi@php.net

2013-05-03T06:22:55+00:00

3fd4b6be6318aa20f53a28820e755bed420d813d

* PHP-5.3:
  From code coverity scan, syscall return value must be check.





* PHP-5.3:
  From code coverity scan, syscall return value must be check.







From code coverity scan, syscall return value must be check.
2013-05-03T06:19:14+00:00

Remi Collet
remi@php.net

2013-05-03T06:19:14+00:00

0549e55d8233c1a0fb3eaf42bf88265f9b0fa5d0

To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.

This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.





To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.

This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.







Merge branch 'PHP-5.3' into PHP-5.4
2013-05-02T11:47:36+00:00

Remi Collet
remi@php.net

2013-05-02T11:47:36+00:00

b7b150b8304419cd4ee8bba28915732d2c852291

* PHP-5.3:
  fix more resource leaks





* PHP-5.3:
  fix more resource leaks







fix more resource leaks
2013-05-02T11:47:24+00:00

Remi Collet
remi@php.net

2013-05-02T11:47:24+00:00

444e59eb2071e8c2d2bcb61bb1e2404dd3b780cf