clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,149 Commits 494 Branches 1,367 Tags 781 MiB
919365bfcf
Commit Graph

3522 Commits

Author SHA1 Message Date
David Zuelke
919365bfcf tests for #895 2014-11-20 08:16:20 +01:00
David Zuelke
75f6b73ab1 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:16:20 +01:00
David Zuelke
5d66314cea 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:16:20 +01:00
Remi Collet
edb05ae37e Merge branch 'PHP-5.6' 
* PHP-5.6:
  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:52:19 +01:00
Remi Collet
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
Remi Collet
cf00c1b2e7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-O)
  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:49:37 +01:00
Remi Collet
c5a1c5f5a4 Fixed bug #68452 php-fpm man page is oudated (-O) 2014-11-19 16:49:05 +01:00
Remi Collet
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
Remi Collet
858c9d86fa Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) 2014-11-19 16:46:51 +01:00
Remi Collet
64a39dc7b0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
 2014-11-18 17:46:15 +01:00
Remi Collet
f164df0b7b add test for bug #68381 2014-11-18 17:45:50 +01:00
David Zuelke
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
David Zuelke
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
Anatol Belski
7c5ae9a1cf fix unsigned check 2014-11-18 13:19:48 +01:00
Anatol Belski
544a2c4792 "extern" shouldn't be used for definitions 2014-11-18 13:19:47 +01:00
Remi Collet
43a02fc31d Merge branch 'PHP-5.6' 
* PHP-5.6:
  simplify fpm tests
 2014-11-18 13:12:19 +01:00
Remi Collet
ec26d7a80f simplify fpm tests 2014-11-18 13:11:53 +01:00
Remi Collet
d86b5e2b08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add test for bug #68442
 2014-11-18 11:10:45 +01:00
Remi Collet
51394dff3f Add test for bug #68442 
Add another helper function fpm_display_log

Restore change from c996a989 badly reverted in 8c0cc49
 2014-11-18 11:08:49 +01:00
Remi Collet
615b0ec7f5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  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
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
 2014-11-18 08:09:56 +01:00
Remi Collet
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
Remi Collet
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
Remi Collet
96220027e1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add new FPM test for IPv4/IPv6
 2014-11-17 15:23:33 +01:00
Remi Collet
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
Remi Collet
ab2215deb3 update fpm configuration for #68428 2014-11-17 09:43:51 +01:00
Remi Collet
d9fd670fdc update fpm configuration for #68428 2014-11-17 09:43:23 +01:00
Remi Collet
09f9f7ce50 update fpm configuration for #68428 2014-11-17 09:43:09 +01:00
Remi Collet
2c816d0c9b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #68428 allowed_client is IPv4 only
 2014-11-17 09:23:59 +01:00
Remi Collet
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
Remi Collet
3a8103ae47 Fixed bug #68428 allowed_client is IPv4 only 2014-11-17 09:22:13 +01:00
Remi Collet
2b1f90af2b Merge branch 'PHP-5.6' 
* PHP-5.6:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-17 06:59:03 +01:00
Remi Collet
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
Remi Collet
4475cbdc85 comment about ipv4-mapped in fpm conf 2014-11-17 06:57:59 +01:00
Remi Collet
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
Remi Collet
9e3ebd3a0d Merge branch 'PHP-5.6' 
* PHP-5.6:
  improve comments about FPM listen option
 2014-11-16 18:01:01 +01:00
Remi Collet
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
Remi Collet
23fd22f9ed improve comments about FPM listen option 2014-11-16 17:59:36 +01:00
Remi Collet
ffbb38dd98 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
 2014-11-15 08:12:07 +01:00
Remi Collet
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
Remi Collet
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
Remi Collet
13401c8098 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-14 19:10:43 +01:00
Remi Collet
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
Remi Collet
5112fdd670 Fix bug #68421 access.format='%R' doesn't log ipv6 address 2014-11-14 19:09:50 +01:00
Remi Collet
871dc9febc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #68423i PHP-FPM will no longer load all pools
 2014-11-14 17:33:14 +01:00
Remi Collet
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
Remi Collet
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
Anatol Belski
f00cf67d1e C89 compat 2014-11-12 17:57:19 +01:00
Anatol Belski
54868c84ce fix int to void* cast on x64 2014-11-12 17:57:15 +01:00
Anatol Belski
96805364fa fix var declaration used by macro conditions 2014-11-10 23:30:15 +01:00
Anatol Belski
5ad7cad103 fix sprintf spec 2014-11-10 23:30:15 +01:00