a128cbad57
fix test description
2014-11-20 08:11:44 +01:00
49be4af42b
tests for #895
2014-11-20 08:11:44 +01:00
befce20c84
move zlog_set_level() again
...
from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894 ),
because otherwise nothing in fpm_conf_init_main() obeys log levels
2014-11-20 08:11:43 +01:00
909d44f20d
Change pm.start_servers default warning to notice
...
Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
2014-11-20 08:11:43 +01:00
7e0ccb6d12
Factorization and consistency
...
- create a fpm_use_error_log() to check when file or stderr should be used
- use it everywhere for consistency
- add some comments
2014-11-20 07:49:54 +01:00
48c0cf7df6
NEWS
2014-11-19 17:03:15 +00:00
1e92b24a2a
Fix #68355 : Inconsistency in example php.ini comments
...
There are some arbitrary differences between php.ini-production and
php.ini-development. This patch corrects the differences.
2014-11-19 16:57:47 +00:00
a521d7e1be
NEWS
2014-11-19 16:49:23 +01:00
c5a1c5f5a4
Fixed bug #68452 php-fpm man page is oudated (-O)
2014-11-19 16:49:05 +01:00
4a36482378
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
NEWS
Fixed bug #68381 Set FPM log level earlier during init
2014-11-19 16:48:21 +01:00
d438bcf226
NEWS
2014-11-19 16:47:52 +01:00
858c9d86fa
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
2014-11-19 16:46:51 +01:00
c40e665ecd
NEWS
2014-11-18 17:45:50 +01:00
f164df0b7b
add test for bug #68381
2014-11-18 17:45:50 +01:00
9a43410871
Fixed bug #68381 Set FPM log level earlier during init
...
The log level will be ignored throughout log events in fpm_unix_init_main, until
the very end when zlog_set_level is finally called.
In particular, fpm_unix_conf_wp may throw notices like this:
> [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when…
Which will still appear even if log_level in php-fpm.conf is set to warning+
2014-11-18 17:45:49 +01:00
5674827ead
NEWS
2014-11-18 17:43:28 +01:00
03cf70ab1e
Fixed bug #68381 Set FPM log level earlier during init
...
The log level will be ignored throughout log events in fpm_unix_init_main, until
the very end when zlog_set_level is finally called.
In particular, fpm_unix_conf_wp may throw notices like this:
> [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when…
Which will still appear even if log_level in php-fpm.conf is set to warning+
2014-11-18 17:42:21 +01:00
ec26d7a80f
simplify fpm tests
2014-11-18 13:11:53 +01:00
51394dff3f
Add test for bug #68442
...
Add another helper function fpm_display_log
Restore change from c996a9898c0cc49
2014-11-18 11:08:49 +01:00
8c0cc49b9b
Add various tests for FPM
...
- covering recent bugs (68420, 68421, 68423, 68428)
- for UDS
- for ping and status URI
- for multi pool and multi mode
2014-11-18 08:07:45 +01:00
a740f9e783
Include small MIT FastCGI client library from
...
https://github.com/adoy/PHP-FastCGI-Client
Add run_request function to easily run a FastCGI call,
which is needed for new tests.
2014-11-18 08:01:18 +01:00
d8868b654e
Add new FPM test for IPv4/IPv6
...
Use 9000+PHP_INT_SIZE as poprt
- to avoid using default 9000
- to allow multipole 32/64 bits simultaneous run
2014-11-17 15:22:04 +01:00
c996a9899e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update fpm configuration for #68428
fix incompatible pointer types
2014-11-17 09:43:26 +01:00
d9fd670fdc
update fpm configuration for #68428
2014-11-17 09:43:23 +01:00
09f9f7ce50
update fpm configuration for #68428
2014-11-17 09:43:09 +01:00
873a460c7c
fix incompatible pointer types
2014-11-17 09:33:58 +01:00
1504e9c9df
fix incompatible pointer types
2014-11-17 09:33:37 +01:00
82c71158c1
NEWS
2014-11-17 09:23:47 +01:00
45b17d0f96
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:23:26 +01:00
6d9b4ca5fc
NEWS
2014-11-17 09:23:16 +01:00
3a8103ae47
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:22:13 +01:00
f22e0c0a6a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
comment about ipv4-mapped in fpm conf
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-17 06:58:28 +01:00
4475cbdc85
comment about ipv4-mapped in fpm conf
2014-11-17 06:57:59 +01:00
4657289e87
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
...
Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)
2014-11-17 06:53:38 +01:00
10a957ed35
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve comments about FPM listen option
2014-11-16 18:00:24 +01:00
23fd22f9ed
improve comments about FPM listen option
2014-11-16 17:59:36 +01:00
51acb9dddd
NEWS
2014-11-15 08:14:43 +01:00
e52295988c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-15 08:14:09 +01:00
69b9381901
NEWS
2014-11-15 08:13:56 +01:00
9871cf78f6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
2014-11-15 08:11:32 +01:00
1d9bb287c5
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
...
Restore default behavior when no address configured:
Listen on all IPv4 addresses.
At some time we could consider to switch to all IPv6
but this will be a BC break.
2014-11-15 08:08:23 +01:00
548352aa1e
NEWS
2014-11-14 19:14:42 +01:00
546fb3407d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-14 19:14:02 +01:00
e4974f6cc6
NEWS
2014-11-14 19:13:53 +01:00
b7bc907cfd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:10:19 +01:00
5112fdd670
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:09:50 +01:00
d66640a334
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68423i PHP-FPM will no longer load all pools
2014-11-14 17:32:46 +01:00
23db119768
Fix bug #68423i PHP-FPM will no longer load all pools
...
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
2014-11-14 17:29:31 +01:00
063a06b8e5
NEWS for 1b15620744
2014-11-14 10:58:27 +01:00
1b15620744
Fix build with gmp < 4.2
...
See 3d6d863ccbacd7fcf55f
2014-11-13 13:08:00 +01:00
David Zuelke