]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 26 Feb 2014 15:37:58 +0000 (16:37 +0100)]
Update stack size in tests/func/010.phpt
Stack size is 16K nowadays. Now the test takes a more reasonable
amount of time to run...
Nikita Popov [Wed, 26 Feb 2014 15:25:10 +0000 (16:25 +0100)]
Don't add num_additional_args in SEND opcodes
Now that trailing positional args are disallowed,
num_additional_args will always be zero in SEND opcodes (and
FUNC_ARG fetches).
Nikita Popov [Wed, 26 Feb 2014 15:08:58 +0000 (16:08 +0100)]
Disallow use of positional args after unpacking
This commit disallows the use of trailing positional arguments
after argument unpacking was used. The following calls are no
longer valid:
fn(...$array, $var);
fn(...$array1, $var, ...$array2);
However, all of the following continue to be valid:
fn($var, ...$array);
fn(...$array1, ...$array2);
fn($var, ...$array1, ...$array2);
The reason behind this change is a stack allocation issue pointed
out by Dmitry: As of PHP 5.5 the stack necessary for pushing
arguments is precomputed and preallocated, as such the individual
SEND opcodes no longer verify that there is enough stack space.
The unpacked arguments will occupy some of that preallocated
space and as such following positional arguments could write past
a stack page boundary.
An alternative resolution for this issue is to ensure that there
is enough space for the remaining arguments in the UNPACK opcode.
However making this allocation precise (rather than using a
conversative over-estimate) would require some effort. Given that
this particular aspect of the feature wasn't very popular in the
first place, it doesn't seem worth the effort.
Nikita Popov [Tue, 25 Feb 2014 23:14:50 +0000 (00:14 +0100)]
Store arg_num in fcall entry
Instead of storing the argument number in the znode of the parameter
list, store it in fcall->arg_num. This mainly cleans up the parameter
parsing code, which previously had to duplicate all rules (this
becomes more excessive as more features are added, e.g. named params
would already require a minimum of 14 rules...)
Nikita Popov [Tue, 25 Feb 2014 22:39:50 +0000 (23:39 +0100)]
Introduce zend_function_call_entry structure
Instead of directly pushing the zend_function* onto the
function_call_stack, push this structure. This allows us to store
additional data on this stack.
Ferenc Kovacs [Wed, 26 Feb 2014 14:29:40 +0000 (15:29 +0100)]
move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
Ferenc Kovacs [Wed, 26 Feb 2014 14:28:36 +0000 (15:28 +0100)]
rearrange the NEWS blocks a bit
Ferenc Kovacs [Wed, 26 Feb 2014 14:13:40 +0000 (15:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add news entry
add news entry
add clear_env option to FPM config
add clear_env option to FPM config
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
Ferenc Kovacs [Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add news entry
add clear_env option to FPM config
Ferenc Kovacs [Wed, 26 Feb 2014 14:08:08 +0000 (15:08 +0100)]
add NEWS block for 5.6.0 beta1
Anatol Belski [Wed, 26 Feb 2014 12:37:20 +0000 (13:37 +0100)]
restored that test part in ext/openssl to enable notify/wait
Anatol Belski [Wed, 26 Feb 2014 11:41:36 +0000 (12:41 +0100)]
remove echo
Anatol Belski [Wed, 26 Feb 2014 10:27:24 +0000 (11:27 +0100)]
fix stdin reading in new openssl tests
Anatol Belski [Wed, 26 Feb 2014 10:23:43 +0000 (11:23 +0100)]
kick redundant include
this is already present from php.h
Daniel Lowrey [Wed, 26 Feb 2014 02:12:33 +0000 (19:12 -0700)]
Prevent implicit function declaration when TLSEXT unavailable
Daniel Lowrey [Tue, 25 Feb 2014 20:22:16 +0000 (13:22 -0700)]
Update NEWS+UPGRADING (openssl)
Daniel Lowrey [Tue, 25 Feb 2014 20:02:13 +0000 (13:02 -0700)]
Remove test case invalidated by openssl.cafile accessibility change
Daniel Lowrey [Tue, 25 Feb 2014 19:43:52 +0000 (12:43 -0700)]
Merge branch 'windowsPeerVerification' of https://github.com/DaveRandom/php-src into PHP-5.6
* 'windowsPeerVerification' of https://github.com/DaveRandom/php-src:
Update openssl tests with new server/client test harness
Add peer certificate verification on windows
Daniel Lowrey [Tue, 25 Feb 2014 05:03:55 +0000 (22:03 -0700)]
Tolerate non-standard newlines when parsing stream CA files
Daniel Lowrey [Mon, 24 Feb 2014 21:41:46 +0000 (14:41 -0700)]
Remove openssl tests that shouldn't have survived last merge
These are .phpt files I meant to remove with the last batch as
the same functionality is now covered in other tests and these
are no longer needed.
Daniel Lowrey [Mon, 24 Feb 2014 20:55:55 +0000 (13:55 -0700)]
Add openssl.cafile ini check when loading cainfo
Daniel Lowrey [Mon, 24 Feb 2014 20:40:43 +0000 (13:40 -0700)]
Change openssl directives to PHP_INI_PERDIR
Because openssl.cafile and openssl.capath have implications for
security these directives have been changed to PHP_INI_PERDIR
(previously PHP_INI_ALL)
Chris Wright [Mon, 24 Feb 2014 14:55:17 +0000 (14:55 +0000)]
Update openssl tests with new server/client test harness
Chris Wright [Fri, 21 Feb 2014 12:08:13 +0000 (12:08 +0000)]
Add peer certificate verification on windows
Peer certificate verification on Windows using the native certificate store and the Windows API
Andrey Hristov [Tue, 25 Feb 2014 15:39:06 +0000 (17:39 +0200)]
Use API instead of directly acessing the structure
Antony Dovgal [Tue, 25 Feb 2014 08:15:35 +0000 (12:15 +0400)]
add news entry
Antony Dovgal [Tue, 25 Feb 2014 08:14:50 +0000 (12:14 +0400)]
add news entry
Paul Annesley [Wed, 19 Feb 2014 19:48:40 +0000 (11:48 -0800)]
add clear_env option to FPM config
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
Paul Annesley [Wed, 19 Feb 2014 19:48:40 +0000 (11:48 -0800)]
add clear_env option to FPM config
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
Christopher Jones [Tue, 25 Feb 2014 01:02:16 +0000 (17:02 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
Christopher Jones [Tue, 25 Feb 2014 01:01:30 +0000 (17:01 -0800)]
Reduce test noise on cross Oracle client <-> server version tests.
This fix is already in PHP 5.6+
Christopher Jones [Tue, 25 Feb 2014 00:35:08 +0000 (16:35 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
Christopher Jones [Tue, 25 Feb 2014 00:33:41 +0000 (16:33 -0800)]
Reduce test noise in cross Oracle client <-> server version testing.
This change is already in PHP 5.6+
Anatol Belski [Mon, 24 Feb 2014 09:13:11 +0000 (10:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed macro
Anatol Belski [Mon, 24 Feb 2014 09:12:50 +0000 (10:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed macro
Anatol Belski [Mon, 24 Feb 2014 09:12:18 +0000 (10:12 +0100)]
fixed macro
Paul Annesley [Wed, 19 Feb 2014 19:48:40 +0000 (11:48 -0800)]
add clear_env option to FPM config
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
Johannes Schlüter [Sun, 23 Feb 2014 13:57:21 +0000 (14:57 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sun, 23 Feb 2014 13:56:32 +0000 (14:56 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sun, 23 Feb 2014 13:55:29 +0000 (14:55 +0100)]
Make sure value is initialized
Johannes Schlüter [Sun, 23 Feb 2014 13:18:24 +0000 (14:18 +0100)]
We can't dereference dbh if it is NULL
Anatol Belski [Fri, 21 Feb 2014 22:09:16 +0000 (23:09 +0100)]
fix linkage
"extern inline" looks like tricky case for portability, but extern
is required with VS. So reduce the case to a starndard one to avoid
unporbatibily.
Daniel Lowrey [Fri, 21 Feb 2014 19:54:37 +0000 (12:54 -0700)]
More openssl UPGRADING updates
Daniel Lowrey [Fri, 21 Feb 2014 19:16:23 +0000 (12:16 -0700)]
Fix build against older OpenSSL libs
Daniel Lowrey [Fri, 21 Feb 2014 16:38:15 +0000 (09:38 -0700)]
Update NEWS/UPGRADING with openssl additions
Daniel Lowrey [Fri, 21 Feb 2014 16:13:55 +0000 (09:13 -0700)]
Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'reneg-limit' of https://github.com/rdlowrey/php-src:
Mitigate client-initiated SSL renegotiation DoS
Daniel Lowrey [Thu, 20 Feb 2014 23:26:55 +0000 (16:26 -0700)]
Mitigate client-initiated SSL renegotiation DoS
Anatol Belski [Fri, 21 Feb 2014 10:23:42 +0000 (11:23 +0100)]
C89 compat
Dmitry Stogov [Fri, 21 Feb 2014 08:44:58 +0000 (12:44 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added information about interned strings usage
Conflicts:
NEWS
Dmitry Stogov [Fri, 21 Feb 2014 08:43:42 +0000 (12:43 +0400)]
Added information about interned strings usage
Dmitry Stogov [Fri, 21 Feb 2014 08:06:35 +0000 (12:06 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated opcache version
Dmitry Stogov [Fri, 21 Feb 2014 08:04:42 +0000 (12:04 +0400)]
Updated opcache version
Dmitry Stogov [Fri, 21 Feb 2014 08:00:33 +0000 (12:00 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added function opcache_is_script_cached(). (Danack)
Conflicts:
NEWS
Dmitry Stogov [Fri, 21 Feb 2014 07:59:14 +0000 (11:59 +0400)]
Added function opcache_is_script_cached(). (Danack)
Daniel Lowrey [Fri, 21 Feb 2014 00:35:44 +0000 (17:35 -0700)]
Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'improved-tls-defaults' of https://github.com/rdlowrey/php-src:
Improve OpenSSL compile flag compatibility, minor updates
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
Improve server forward secrecy, refactor client SNI
Add 'honor_cipher_order' server context option
Add 'capture_session_meta' context option
Disable TLS compression by default in both clients and servers
Release ssl buffers
Add openssl_get_cert_locations() function
Explicitly set cert verify depth if not specified
Strengthen default cipher list
Daniel Lowrey [Fri, 21 Feb 2014 00:20:40 +0000 (17:20 -0700)]
Improve OpenSSL compile flag compatibility, minor updates
Daniel Lowrey [Tue, 11 Feb 2014 15:12:01 +0000 (08:12 -0700)]
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
Daniel Lowrey [Tue, 11 Feb 2014 15:42:34 +0000 (08:42 -0700)]
Improve server forward secrecy, refactor client SNI
Daniel Lowrey [Thu, 20 Feb 2014 03:39:57 +0000 (20:39 -0700)]
Add 'honor_cipher_order' server context option
Daniel Lowrey [Tue, 11 Feb 2014 13:42:29 +0000 (06:42 -0700)]
Add 'capture_session_meta' context option
Daniel Lowrey [Tue, 11 Feb 2014 13:27:32 +0000 (06:27 -0700)]
Disable TLS compression by default in both clients and servers
Daniel Lowrey [Tue, 11 Feb 2014 13:24:34 +0000 (06:24 -0700)]
Release ssl buffers
Daniel Lowrey [Tue, 11 Feb 2014 12:57:15 +0000 (05:57 -0700)]
Add openssl_get_cert_locations() function
Daniel Lowrey [Tue, 11 Feb 2014 12:39:02 +0000 (05:39 -0700)]
Explicitly set cert verify depth if not specified
Daniel Lowrey [Tue, 11 Feb 2014 12:26:08 +0000 (05:26 -0700)]
Strengthen default cipher list
Anatol Belski [Thu, 20 Feb 2014 23:23:01 +0000 (00:23 +0100)]
fixed path separator in the tests
Sara Golemon [Thu, 20 Feb 2014 19:55:27 +0000 (11:55 -0800)]
Add more tests for __debugInfo() and fix leak
Anatol Belski [Thu, 20 Feb 2014 18:05:59 +0000 (19:05 +0100)]
updated libmagic.patch for 5.6+
Anatol Belski [Thu, 20 Feb 2014 18:01:09 +0000 (19:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.4/5
Anatol Belski [Thu, 20 Feb 2014 18:00:36 +0000 (19:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch in 5.4/5
Anatol Belski [Thu, 20 Feb 2014 18:00:05 +0000 (19:00 +0100)]
updated libmagic.patch in 5.4/5
Anatol Belski [Thu, 20 Feb 2014 17:55:05 +0000 (18:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed leak introduced after CVE/upgrade
Anatol Belski [Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed leak introduced after CVE/upgrade
Anatol Belski [Thu, 20 Feb 2014 17:53:53 +0000 (18:53 +0100)]
fixed leak introduced after CVE/upgrade
Bob Weinand [Thu, 20 Feb 2014 16:49:45 +0000 (17:49 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Thu, 20 Feb 2014 16:48:38 +0000 (17:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Thu, 20 Feb 2014 16:39:58 +0000 (17:39 +0100)]
Use nicer output for characters < 32 and > 126 in exception strings
Using question marks might confuse more than it helps.
Users are wondering what happened to their string...
Xinchen Hui [Thu, 20 Feb 2014 03:19:52 +0000 (11:19 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Thu, 20 Feb 2014 01:44:18 +0000 (10:44 +0900)]
Update pgsql document
Anatol Belski [Thu, 20 Feb 2014 01:07:34 +0000 (02:07 +0100)]
some missing pieces for __debugInfo
Brad Daily [Wed, 19 Feb 2014 21:24:15 +0000 (15:24 -0600)]
Fixes #66714: imageconvolution breakage in 5.5.9
5.5.9 included some GD fixes related to #66356. One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.
Daniel Lowrey [Wed, 19 Feb 2014 11:17:33 +0000 (04:17 -0700)]
Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'bug-65538' of https://github.com/rdlowrey/php-src:
Add tests for Bug #65538
Fix Bug #65538 (cafile now supports stream wrappers)
Daniel Lowrey [Wed, 19 Feb 2014 11:01:57 +0000 (04:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Skip failing tests when EC unavailable (RHEL)
Daniel Lowrey [Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)
Conflicts:
ext/openssl/openssl.c
Daniel Lowrey [Wed, 19 Feb 2014 10:57:37 +0000 (03:57 -0700)]
Skip failing tests when EC unavailable (RHEL)
Anatol Belski [Wed, 19 Feb 2014 10:28:55 +0000 (11:28 +0100)]
updated NEWS
Anatol Belski [Wed, 19 Feb 2014 10:20:24 +0000 (11:20 +0100)]
updated libmagic.patch
Anatol Belski [Wed, 19 Feb 2014 10:01:42 +0000 (11:01 +0100)]
remove PHP_API_VERSION <
20100412 check
Anatol Belski [Wed, 19 Feb 2014 09:48:52 +0000 (10:48 +0100)]
expose correct libmagic version
Anatol Belski [Wed, 19 Feb 2014 09:04:29 +0000 (10:04 +0100)]
fixed tests in ext/fileinfo
Anatol Belski [Wed, 19 Feb 2014 09:02:36 +0000 (10:02 +0100)]
updated to libmagic-5.17
Anatol Belski [Tue, 18 Feb 2014 18:09:04 +0000 (19:09 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch
Anatol Belski [Tue, 18 Feb 2014 18:08:45 +0000 (19:08 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch
Anatol Belski [Tue, 18 Feb 2014 18:08:16 +0000 (19:08 +0100)]
updated libmagic.patch
Stanislav Malyshev [Tue, 18 Feb 2014 16:48:52 +0000 (08:48 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news with CVE
5.5.11-dev next
5.5.11 next for NEWS
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 18 Feb 2014 16:47:43 +0000 (08:47 -0800)]
MErge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update news with CVE
Stanislav Malyshev [Tue, 18 Feb 2014 16:36:51 +0000 (08:36 -0800)]
update news with CVE
Julien Pauli [Tue, 18 Feb 2014 15:45:48 +0000 (16:45 +0100)]
5.5.11-dev next
Julien Pauli [Tue, 18 Feb 2014 15:40:19 +0000 (16:40 +0100)]
5.5.11 next for NEWS
Remi Collet [Tue, 18 Feb 2014 12:58:36 +0000 (13:58 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
NEWS
NEWS
Fixed Bug #66731 file: infinite recursion