php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,131 Commits 549 Branches 1,485 Tags
21da246807274df4ab04ca666a1069f4e1539a3b
Commit Graph

472 Commits

Author SHA1 Message Date
Remi Collet 744ada7d9d Fix bug #68526 Implement POSIX Access Control List for UDS 
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option

Keep old behavior (chmod) if option not used or not supported.
 2014-12-10 08:15:21 +01:00
Remi Collet cb1a297bf4 XFAIL as catch_workers_output = yes seems not reliable 2014-12-01 07:28:49 +01:00
Remi Collet e1d4ac426c Move chown to fpm_unix_set_socket_premissions() 
For consistency, with fpm_unix_resolve_socket_premissions.
Compute + Use in the same source file.
To make easier future enhancement.

Also check chdir output to fix a build warning.
 2014-11-29 16:49:08 +01:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Remi Collet 3a3f67f79b minor typo in test 2014-11-22 10:29:51 +01:00
Remi Collet fd5c421a00 add test for global / pool prefix and bug #68478 2014-11-22 10:29:05 +01:00
Remi Collet b924af8db9 Fixed Bug #68478 acess_log don't use prefix 
Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log
 2014-11-22 10:25:53 +01:00
Remi Collet 1e14f805f9 add test for fastcgi_finish_request() 2014-11-21 11:28:20 +01:00
Remi Collet 5234c2941f add test for #68391 2014-11-21 07:36:34 +01:00
Remi Collet 61f6cd0da5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #68391 Returns the pool config files in order
 2014-11-21 07:35:10 +01:00
Florian MARGAINE 29d2c13809 Fixed bug #68391 Returns the pool config files in order 
Fixes https://bugs.php.net/bug.php?id=68391
 2014-11-21 07:33:15 +01:00
Remi Collet 6e1e113b91 adapt test for error message introduce in fix for #68463 2014-11-20 15:15:54 +01:00
Remi Collet 5c6ccb2d8f Fix bug #68463 listen.allowed_clients can silently result in no allowed access 
Add a "There are no allowed addresses for this pool"
 2014-11-20 15:14:34 +01:00
Remi Collet 7ef559ff80 run a few request in this test 2014-11-20 14:45:17 +01:00
Remi Collet 9fd54bd9d8 Raise a warning when listen = hostname used and is resolved as multiple addresses 
Using getaddrinfo is perhaps not a good idea... if we are not able
to listen on multiple addresses...

At least this message should help to diagnose problem, ex
... Found address for localhost, socket opened on ::1
... Found multiple addresses for localhost, 127.0.0.1 ignored
 2014-11-20 10:15:15 +01:00
Remi Collet 1939097ede Fixed #68458 Change pm.start_servers default warning to notice 
Add another test
014 checks that no "notice" are traced when log_level=warning
015 checks that "notice" are traced when log_level=notice
 2014-11-20 08:12:27 +01:00
David Zuelke a128cbad57 fix test description 2014-11-20 08:11:44 +01:00
David Zuelke 49be4af42b tests for #895 2014-11-20 08:11:44 +01:00
David Zuelke 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
David Zuelke 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
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 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 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
Remi Collet ec26d7a80f simplify fpm tests 2014-11-18 13:11:53 +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 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 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 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 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 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 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 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 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 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
Ferenc Kovacs 200e407b24 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm
 2014-10-03 11:39:09 +02:00
Robin Gloster 15ba757a2b add IPv6 support to php-fpm 2014-10-03 11:35:27 +02:00
Remi Collet 47bc380ecf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
 2014-09-15 13:31:26 +02:00