mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
108,190 Commits 500 Branches 1,381 Tags 818 MiB
4371945b8b
Commit Graph

821 Commits

Author SHA1 Message Date
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Dmitry Stogov
1433162083 Fixed compilation warnings 2016-06-21 20:12:29 +03:00
Dmitry Stogov
22ecd4428a Fixed compilation warnings 2016-06-21 17:56:07 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions. 
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
 2016-06-21 16:00:37 +03:00
Dmitry Stogov
c8706331b5 Cleanup zend_signal API 2016-06-20 14:58:42 +03:00
Xinchen Hui
0ed4034881 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72308 (fastcgi_finish_request and logging environment variables)
 2016-06-02 14:17:00 +08:00
Xinchen Hui
31ce3a661a Fixed bug #72308 (fastcgi_finish_request and logging environment variables) 2016-06-02 14:16:32 +08:00
Ferenc Kovacs
1380a6c2ff Merge branch 'PHP-7.0' 
* PHP-7.0:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:05:16 +02:00
Ferenc Kovacs
8f35ee49ee Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:04:55 +02:00
Ferenc Kovacs
3a16f511d9 mark frequent intermittent fpm test with XFAIL 2016-04-18 09:04:27 +02:00
Mickaël
0c2e184eac fpm: call zend_signal_init() in child 
This addresses bug #71269.

When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).

This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083.
 2016-02-15 13:23:37 +08:00
Xinchen Hui
2b6f06b70c Merge branch 'patch-1' of https://github.com/mickael9/php-src 
* 'patch-1' of https://github.com/mickael9/php-src:
  fpm: call zend_signal_init() in child
 2016-02-15 13:23:01 +08:00
Lior Kaplan
85ce6a7d38 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Align spacing in make install messages
 2016-02-08 20:33:17 +02:00
Lior Kaplan
fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
 2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02:00
Remi Collet
e846801c79 Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:58 +01:00
Remi Collet
c0802af52c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:15 +01:00
Remi Collet
07d2dcdf09 Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup 
Only needed with Apache version < 2.4.12 (ex RHEL-7)
 2016-01-29 10:20:42 +01:00
Mickaël
b0780d3f41 fpm: call zend_signal_init() in child 
This addresses bug #71269.

When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).

This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083.
 2016-01-09 04:54:02 +01:00
Anatol Belski
ea130bfd59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-06 06:10:39 +01:00
Anatol Belski
c0928be7f8 Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0 
* phpsec/PHP-7.0:
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
 2016-01-06 06:09:12 +01:00
Stanislav Malyshev
13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-05 19:38:29 -08:00
Julien Pauli
928d2cb3a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Happy new year (Update copyright to 2016)
 2016-01-04 18:14:08 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Stanislav Malyshev
2eaa755660 Fixed bug #70755: fpm_log.c memory leak and buffer overflow 2016-01-04 17:36:42 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
ea12ff149c Added support for HTTP 451 2015-12-23 11:31:18 +01:00
Bob Weinand
817ed01320 Merge PR #1638 (Fix naming of global section in fpm_conf_dump()) 2015-12-16 16:46:17 +01:00
Stanislav Malyshev
be19dbcb84 Fixed bug #70755: fpm_log.c memory leak and buffer overflow 2015-12-08 00:10:07 -08:00
Lior Kaplan
c1b374554c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
 2015-11-23 19:02:41 +02:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Gordon Oheim
0dc8a8cac0 Fix naming 
The global section is named "General", but the correct section name is "global". It is "global" in #1313 and also "global" in https://github.com/php/php-src/blob/master/sapi/fpm/php-fpm.conf.in. The commit fixes the naming. However, the proposed change might break any tooling that relies on finding "General" in the output though.
 2015-11-13 15:01:10 +01:00
Xinchen Hui
a79a504b6d Merge branch 'PHP-7.0' 2015-11-02 16:43:52 +08:00
Xinchen Hui
d7ff107654 Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms) 2015-11-02 16:43:28 +08:00
Xinchen Hui
8dd5e1c2b5 Add test_fpm_conf to skip some tests ranth than mark --xfail-- 2015-11-02 16:42:11 +08:00
ngsw
90d1e9d178 Fix: fold-maker `fpm_event_pre_init()' 2015-10-22 23:21:46 +09:00
Xinchen Hui
1d6228b46a Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer reqeusts) 2015-09-22 15:28:53 +08:00
Xinchen Hui
85eece9c4f Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 11:18:37 +08:00
Xinchen Hui
a247c3a27d Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 10:55:38 +08:00
Joe Watkins
85a511d2c1 fix zend signal and tsrm compat 2015-09-01 09:34:54 +01:00
Dmitry Stogov
7aa7627172 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 13:59:27 +03:00
Dmitry Stogov
f0d2a0e542 Encapsulate FastCGI implementation details. 
Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
 2015-06-23 16:27:21 +03:00
Stanislav Malyshev
07241bbd70 FIx darwin build 2015-05-31 14:52:08 -07:00
redfoxli
2ece3ea699 improperlog 2015-05-30 14:37:41 +08:00
Xinchen Hui
2b41c04124 Seems useless now 2015-05-27 16:54:32 +08:00
Xinchen Hui
90df7e75e6 Merge branch 'master' into merge-fastcgi 
Conflicts:
	sapi/fpm/fpm/fpm_main.c
 2015-05-27 16:36:15 +08:00
Xinchen Hui
4a728227fc Merge branch 'PHP-5.6' 2015-05-26 16:26:23 +08:00
Xinchen Hui
1f077cc4f4 Merge branch 'PHP-5.5' into PHP-5.6 2015-05-26 16:24:39 +08:00
Xinchen Hui
76a290d0be Fixed C89 2015-05-26 16:24:18 +08:00
Xinchen Hui
9f1788f00d Only link fastcgi into fpm and cgi 2015-05-26 13:55:39 +08:00
Xinchen Hui
5f753f9e2e Micro optimizations 2015-05-26 11:47:01 +08:00
Xinchen Hui
06483a98d6 Fixed va_list double used 2015-05-25 15:40:32 +08:00
Xinchen Hui
f20118aa66 Avoid multipy allocating of request env 2015-05-24 01:07:36 +08:00
Xinchen Hui
86de98caba Use weak function for fcgi_log 2015-05-23 19:19:48 +08:00
Xinchen Hui
18cf4e0a8a Fixed fpm-side (tests passes) 2015-05-23 19:01:41 +08:00
Dmitry Stogov
abb616ae20 Merged fastcgi.* reated changes from sapi/cgi 2015-05-13 18:54:41 +03:00
Matthias Breddin
3b6381125c Update www.conf.in 2015-05-12 13:52:49 +02:00
Matthias Breddin
6bd4c3e17d Detailed information about the strftime access.log format 
More descriptive usage of a custom timeformat
 2015-05-12 13:52:49 +02:00
Xinchen Hui
16265a59ac Use explicit type here 2015-05-12 16:35:57 +08:00
Xinchen Hui
81049cdf06 Implemented fpm_trace for PHP7 2015-05-11 11:22:38 +08:00
Xinchen Hui
460e2e6a04 Fixed test in some cases(for more children, needs more time) 2015-05-07 19:25:04 +08:00
Floris Bos
bb19125781 Fix php-fpm.service.in 
- Expand file paths.
- Remove obsolete After=syslog.target. Syslog is socket activated nowadays.

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
 2015-05-01 15:28:55 +02:00
Dmitry Stogov
ec077328fd Make valgrind happy 2015-04-15 14:20:59 +03:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Havard Eidnes
36e251ade3 Treat NetBSD the same as FreeBSD wrt. TCP_INFO usage. 2015-03-19 09:39:54 +01:00
xingxing
1b0d32b350 Add configtest option to fpm init.d script 2015-03-08 22:48:29 +08:00
Felipe Pena
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Antony Dovgal
1d94cd4bfa Merge branch 'pull-request/995' into PHP-5.5 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731 Merge branch 'pull-request/995' into PHP-5.6 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:15:11 +03:00
redfoxli
3664345aba fix bug #68822 (request time is reset too early) 
this caused wrong time in the logs
 2015-02-16 15:10:09 +03:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Xinchen Hui
e5d8a14239 Revert "Cleanup globals initialization" 
This reverts commit 309e90638d.
 2015-02-13 18:25:44 +08:00
Xinchen Hui
94dcddbc4a Revert "Remove useless TSRMLS by merge" 
This reverts commit 5e7fd50376.
 2015-02-13 18:25:31 +08:00
Xinchen Hui
5e7fd50376 Remove useless TSRMLS by merge 2015-02-13 11:02:37 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Michael Wallner
c0477fbcb5 Squashed commit of the following: 
commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
 2015-01-30 23:01:26 +01:00
Xinchen Hui
88e13bda6a Fixed bug #68945 (Unknown admin values segfault pools) 2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015 Merge branch 'PHP-5.6' 2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172 fcgi_write in fpm returns ssizt_t, but it returns int in cgi 2015-01-27 22:25:38 +08:00
Xinchen Hui
9fdf62d64a Merge branch 'PHP-5.6' 
Conflicts:
	sapi/cgi/cgi_main.c
 2015-01-27 22:15:12 +08:00
Xinchen Hui
6336fa18c4 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a Also Fixed #68571 in CGI SAPI, and some cleanup 2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199 Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5 2015-01-27 22:04:23 +08:00
Nikita Popov
e05993dfa2 Remove dl() on fpm-fcgi 2015-01-26 21:00:23 +01:00
Rasmus Lerdorf
e242f871df Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:39:23 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Rasmus Lerdorf
50c721a623 These tests all assume that IPV6 is available. 2015-01-09 17:24:48 -08:00
Remi Collet
1b5e87862f Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup old unused typedef
 2015-01-06 11:07:10 +01:00
Remi Collet
0ba32e5cf9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup old unused typedef
 2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a cleanup old unused typedef 2015-01-06 11:06:25 +01:00
Remi Collet
e7cdf9df7c Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:36:26 +01:00
Remi Collet
eb1a1d5feb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:35:14 +01:00
Remi Collet
1b6d076244 Fix bug #68751 listen.allowed_clients is broken 2015-01-05 17:33:57 +01:00
Xinchen Hui
28985e982b Still -1 on *BSD now 2015-01-04 22:08:35 -05:00
Xinchen Hui
80c0a02286 This is 511 now (ebf4ffc935) 2015-01-04 22:04:32 -05:00
Stanislav Malyshev
73d74ac54c Merge branch 'pull-request/731' 
* pull-request/731:
  Set FPM_BACKLOG_DEFAULT to 511
 2015-01-04 19:00:05 -08:00
Xinchen Hui
8cd8c2ccfb Fixed warning 2014-12-22 23:39:32 +08:00
Andrea Faulds
e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00
Anatol Belski
a857f3a147 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Fix bug #67106 split main fpm config
  split fpm config to two parts. PR#903
  fix typo
  Fix undefined behaviour in strnatcmp
  Fix undefined behaviour in strnatcmp
  Fixed memory leak introduced by 73458e8f
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-14 19:44:24 +01:00
Elan Ruusamäe
9f189dd290 split fpm config to two parts. PR#903 
main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
 2014-12-14 14:21:46 +01:00
Remi Collet
70c141b8f8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
 2014-12-14 09:23:25 +01:00
Remi Collet
505adabf25 fix typo 2014-12-14 09:22:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
redfoxli
7953d830ab follow C89 format 2014-12-10 21:58:57 +08:00
Remi Collet
19d481945e Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68526 Implement POSIX Access Control List for UDS
 2014-12-10 08:19:29 +01:00
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
redfoxli
d0a58695d0 fix-bug-68571-to-php5.5 2014-12-09 19:42:55 +08:00
Remi Collet
4ba828652b Merge branch 'PHP-5.6' 
* PHP-5.6:
  XFAIL as catch_workers_output = yes seems not reliable
 2014-12-01 07:29:19 +01:00
Remi Collet
cb1a297bf4 XFAIL as catch_workers_output = yes seems not reliable 2014-12-01 07:28:49 +01:00
Remi Collet
bfa9c4609d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Move chown to fpm_unix_set_socket_premissions()
 2014-11-29 16:52:25 +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
Remi Collet
95a609c5d1 FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+ IPv4-mapped) 2014-11-24 09:38:36 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08: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
c50ee655ea 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:35:51 +01:00
Remi Collet
48fa365006 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  minor typo in test
  add test for global / pool prefix and bug #68478
  Fixed Bug #68478 acess_log don't use prefix
 2014-11-22 10:31:26 +01: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
146d42ae5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  add test for fastcgi_finish_request()
 2014-11-21 11:28:42 +01:00
Remi Collet
1e14f805f9 add test for fastcgi_finish_request() 2014-11-21 11:28:20 +01:00
Remi Collet
5be75da202 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-21 07:55:13 +01:00
Remi Collet
c4ca220467 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-21 07:54:51 +01:00
David Zuelke
9e8d4a1b06 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-21 07:49:08 +01:00
David Zuelke
8beb153460 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-21 07:47:04 +01:00
Remi Collet
a849096c08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add test for #68391
  NEWS
  NEWS
  Fixed bug #68391 Returns the pool config files in order
 2014-11-21 07:37:05 +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
8904fbc692 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  adapt test for error message introduce in fix for #68463
  Fix bug #68463 listen.allowed_clients can silently result in no allowed access
 2014-11-20 15:17:02 +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
9081e8a4d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  run a few request in this test
 2014-11-20 14:45:35 +01:00
Remi Collet
7ef559ff80 run a few request in this test 2014-11-20 14:45:17 +01:00
Remi Collet
6bb201e46e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Raise a warning when listen = hostname used and is resolved as multiple addresses
  NEWS
  Fixed #68458 Change pm.start_servers default warning to notice
  fix test description
  tests for #895
  move zlog_set_level() again
  Change pm.start_servers default warning to notice
 2014-11-20 10:18:12 +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
dec0db79c3 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:16:21 +01:00
David Zuelke
8bd99d1ca7 fix test description 2014-11-20 08:16:20 +01:00
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
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
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
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
Ferenc Kovacs
e13e305b93 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS entry for previous commit
  NEWS entry for previous commit
  add IPv6 support to php-fpm
 2014-10-03 11:40:05 +02: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