Veres Lajos
4b9535341a
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-19 20:23:00 +00:00
Peter Cowburn
f767451980
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix #68355 : Inconsistency in example php.ini comments
2014-11-19 17:06:59 +00:00
Peter Cowburn
48c0cf7df6
NEWS
2014-11-19 17:03:15 +00:00
Chris McCafferty
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
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
a521d7e1be
NEWS
2014-11-19 16:49:23 +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
d438bcf226
NEWS
2014-11-19 16:47:52 +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
c40e665ecd
NEWS
2014-11-18 17:45:50 +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
Remi Collet
5674827ead
NEWS
2014-11-18 17:43:28 +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
5400f92c75
proper dllexport
2014-11-18 15:38:35 +01:00
Anatol Belski
376a366f0c
move to size_t where zend_string is used internally
2014-11-18 13:19:53 +01:00
Anatol Belski
075fc1ff1a
fix some datatype mismatches
2014-11-18 13:19:52 +01:00
Anatol Belski
f8f86a44ef
return after the warning, to fix uninitialized salt usage
2014-11-18 13:19:52 +01:00
Anatol Belski
7e8e7ff634
fix datatype mismatches
2014-11-18 13:19:51 +01:00
Anatol Belski
2a1bfe6f0c
add missing type specifier
2014-11-18 13:19:50 +01:00
Anatol Belski
fb6c3d3cf5
fix datatype mismatches
2014-11-18 13:19:49 +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
Anatol Belski
6b3b4fc944
joined identical conditional blocks
2014-11-18 13:19:46 +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
Dmitry Stogov
e20a727430
SEND_VAR_NO_REF optimization
2014-11-18 14:37:36 +03: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 c996a9898c0cc49
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
Dmitry Stogov
c746dcd7fd
Get rid of zend_free_op structure (use zval* instead).
...
Get rid of useless TSRMLS arguments.
2014-11-18 09:05:48 +03: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
Dmitry Stogov
76019b86c0
Reorder fields for most often access pattern
2014-11-17 14:06:50 +03:00
Remi Collet
269470e65e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update fpm configuration for #68428
update fpm configuration for #68428
fix incompatible pointer types
fix incompatible pointer types
2014-11-17 09:43:56 +01:00
Remi Collet
ab2215deb3
update fpm configuration for #68428
2014-11-17 09:43:51 +01:00
Remi Collet
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
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
Anatol Belski
317d7c62ee
fix incompatible pointer types
2014-11-17 09:34:20 +01:00
Anatol Belski
873a460c7c
fix incompatible pointer types
2014-11-17 09:33:58 +01:00
Anatol Belski
1504e9c9df
fix incompatible pointer types
2014-11-17 09:33:37 +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
82c71158c1
NEWS
2014-11-17 09:23:47 +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
6d9b4ca5fc
NEWS
2014-11-17 09:23:16 +01:00
