658f7d77f9
See bug #67635
...
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
2014-07-20 11:14:43 +02:00
144a083954
improve previous, add message during configure
2014-07-19 18:42:40 +02:00
7b60315672
Fixed bug #67635 php links to systemd libraries without using pkg-config
...
Patch from pacho at gentoo dot org
Rely on pkg-config for systemd >= 209
Failback on old check
2014-07-19 18:40:20 +02:00
0c840ced7c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix Bug #67530 error_log=syslog ignored
2014-07-08 08:30:44 +02:00
f8acf826c3
Fix Bug #67530 error_log=syslog ignored
...
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-07-08 08:29:24 +02:00
af9ce6e650
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
2014-06-30 18:38:15 +02:00
9c8b42960d
Revert "Fix Bug #67530 error_log=syslog ignored"
...
This reverts commit a0ecb3794f
2014-06-30 18:37:23 +02:00
13c5bb9600
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
2014-06-27 09:50:27 +02:00
bf328b1681
Fix Bug #67531 syslog cannot be set in pool configuration
...
error_log is listed in FPM_PHP_INI_TO_EXPAND,
but should not be expand when value = syslog
2014-06-27 09:47:28 +02:00
a0ecb3794f
Fix Bug #67530 error_log=syslog ignored
...
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-06-27 09:45:53 +02:00
770fcdab90
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67060 : use default mode of 660
2014-04-29 09:15:23 -07:00
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07:00
6bad228b4e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:23:43 -07:00
49341e992a
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
...
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
2014-04-20 16:21:49 -07:00
5811610d71
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:31:44 -07:00
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
eb6941e902
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:12:09 +04:00
6e15afd1be
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:06:32 +04:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
812dfbc431
Fix bug #66008
2013-10-31 03:18:07 -07:00
b4bed6fde0
Fix bug #66008
2013-10-31 03:06:35 -07:00
9765763413
increase backlog to the highest value everywhere
...
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
9e4651f6f1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix typo
2013-10-20 17:56:14 -07:00
18cc5386de
Fix typo
2013-10-20 17:55:55 -07:00
26b27767a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize these to make Coverity happy
Typo fix: managment -> management
Use minus sign instead of hyphen
Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:41:04 -07:00
813e867652
Initialize these to make Coverity happy
2013-10-19 17:37:59 -07:00
a55d3b9295
Typo fix: managment -> management
2013-10-19 23:53:23 +03:00
df501fd464
Use minus sign instead of hyphen
2013-10-19 23:52:43 +03:00
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
efbf573e9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:08:51 -03:00
cd176e0452
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:06:27 -03:00
a770ae36c2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:56:29 -07:00
ee01af7df1
Fix bug #64764 : Add status option to fpm init.d script
2013-06-16 16:54:49 -07:00
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
433731d463
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #64915 (error_log ignored when daemonize=0)
2013-05-24 12:10:39 +02:00
9f6ca9bc64
Fixed Bug #64915 (error_log ignored when daemonize=0)
...
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
2013-05-24 12:09:05 +02:00
c79f162c37
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:53:51 +02:00
0e99329e0a
Add --with-fpm-systemd option to report health to systemd, and
...
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.
2013-05-21 09:49:00 +02:00
c9085837a9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
From code coverity scan, syscall return value must be check.
2013-05-03 08:23:07 +02:00
3fd4b6be63
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
From code coverity scan, syscall return value must be check.
2013-05-03 08:22:55 +02:00
0549e55d82
From code coverity scan, syscall return value must be check.
...
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.
2013-05-03 08:19:14 +02:00
Remi Collet