Alexander Lisachenko
a023e032b9
Fix incorrect argument reflection info for array_multisort()
2014-11-23 16:29:15 -08:00
Stanislav Malyshev
5a3e236bd5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS order
2014-11-23 16:24:54 -08:00
Stanislav Malyshev
03dcf66f9a
fix NEWS order
2014-11-23 16:21:53 -08:00
Stanislav Malyshev
faee48506d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
2014-11-23 16:18:52 -08:00
Stanislav Malyshev
05394d6056
update NEWS
2014-11-23 16:18:04 -08:00
Stanislav Malyshev
9ef264504d
Merge branch 'pull-request/840' into PHP-5.5
...
* pull-request/840:
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
2014-11-23 16:17:17 -08:00
Stanislav Malyshev
7e4de4f8d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update comments in php.ini
2014-11-23 16:13:58 -08:00
Sobak
6d148f7ed9
Update comments in php.ini
2014-11-23 16:13:44 -08:00
Stanislav Malyshev
fa7615af59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added missing INSTALL_ROOT
2014-11-23 16:09:40 -08:00
Sebastian Brandt
c7248e6359
added missing INSTALL_ROOT
2014-11-23 16:09:24 -08:00
Reeze Xia
7386b74b07
Fix php.ini-*'s comment about directive: request_order
...
request_order directive only support register G,P,C but not all of
the EGPCS global variables.
The doc <http://php.net/manual/en/ini.core.php#ini.request-order >
is ok.
2014-11-23 16:07:47 -08:00
Kévin Dunglas
8439eb6277
Minor: typo fix in filter_var comment
2014-11-23 15:18:47 -08:00
Dominic Luechinger
437ab7f1f4
Minor fix: Missing quotes in openssl test case for bug bug64802
2014-11-23 15:15:49 -08:00
Bob Weinand
dd70a2c7ae
Added NEWS entry and test for bug 68446
2014-11-24 00:08:45 +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
Bob Weinand
5ef138b0c7
Fix bug #68446 (bug with constant defaults and type hints)
2014-11-23 21:10:41 +01:00
Remi Collet
c8dd415543
typo
2014-11-22 10:37:22 +01:00
Remi Collet
6e17a439a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #68478 acess_log don't use prefix
2014-11-22 10:36:54 +01:00
Remi Collet
9664312e30
NEWS
2014-11-22 10:36:45 +01: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
6b974874ab
NEWS
2014-11-22 10:30:42 +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
Stanislav Malyshev
515fa6160d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "made lsapi_main.c compatible with PHP7/phpng ."
Updated NEWS
2014-11-22 00:41:06 -08:00
Stanislav Malyshev
bc55af0cf2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "made lsapi_main.c compatible with PHP7/phpng ."
2014-11-22 00:40:11 -08:00
Stanislav Malyshev
96cde1841a
Revert "made lsapi_main.c compatible with PHP7/phpng ."
...
This reverts commit 9fb816f45a
.
Not a security-related fix.
2014-11-22 00:38:04 -08:00
Julien Pauli
9a06628c80
Updated NEWS
2014-11-21 16:17:49 +01:00
Julien Pauli
99fa36cc58
Updated NEWS
2014-11-21 16:16:54 +01:00
Julien Pauli
ab3525c401
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #68185 - Inconsistent insteadof definition
Conflicts:
Zend/zend_compile.c
2014-11-21 15:50:27 +01:00
Julien Pauli
cd3b46f28a
Fix #68185 - Inconsistent insteadof definition
2014-11-21 15:37:33 +01:00
Anatol Belski
64b9277867
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-11-21 13:57:46 +01:00
Anatol Belski
59a9e7af21
fixed test
...
on Linux gettext requires a locale to be installed on the system
2014-11-21 13:56:49 +01:00
Remi Collet
1e14f805f9
add test for fastcgi_finish_request()
2014-11-21 11:28:20 +01:00
Anatol Belski
0581e877a5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added test for things done so far for bug #66265
partially fixed bug #66265
forked bug67052.phpt for Windows
2014-11-21 10:24:53 +01:00
Anatol Belski
f2e33dc725
added test for things done so far for bug #66265
2014-11-21 10:22:47 +01:00
Anatol Belski
56fac96bec
partially fixed bug #66265
...
NTS mode should additionally use _putenv to satisfy libs like gettext
relying on _getenv. As _putenv isn't thread safe, it wouldn't bring
much for the TS mode as it would change locale across all the threads
and require locking to avoid random fails with concurrent _getenv
calls.
2014-11-21 09:57:12 +01:00
Anatol Belski
502ce90873
forked bug67052.phpt for Windows
2014-11-21 09:53:55 +01:00
Remi Collet
b97fd60b42
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
Raise a warning when listen = hostname used and is resolved as multiple addresses
2014-11-21 07:56:48 +01:00
Remi Collet
8be510ae63
NEWS
2014-11-21 07:56:39 +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
Remi Collet
d10df70f4e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
move zlog_set_level() again
Change pm.start_servers default warning to notice
2014-11-21 07:50:04 +01:00
Remi Collet
1f4972e348
NEWS
2014-11-21 07:49:53 +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
5234c2941f
add test for #68391
2014-11-21 07:36:34 +01:00
Remi Collet
4ab05e8f69
NEWS
2014-11-21 07:35:49 +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
Remi Collet
cf3a902286
NEWS
2014-11-21 07:34:40 +01:00