1
0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Commit Graph

130175 Commits

Author SHA1 Message Date
Dmitry Stogov
5a68d991ad Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix memory leak
2022-10-17 15:09:33 +03:00
Dmitry Stogov
eecbb60db6 Fix memory leak
Fixes oss-fuzz #52479
2022-10-17 15:08:21 +03:00
Dmitry Stogov
61b2b3e99c Merge branch 'PHP-8.2'
* PHP-8.2:
  Reset JIT for dynamic functions on opcache restrart
2022-10-17 11:27:20 +03:00
Dmitry Stogov
d282345e11 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Reset JIT for dynamic functions on opcache restrart
2022-10-17 11:27:12 +03:00
Dmitry Stogov
61e563ca40 Reset JIT for dynamic functions on opcache restrart 2022-10-17 11:26:30 +03:00
Dmitry Stogov
63c8ad4c7e Merge branch 'PHP-8.2'
* PHP-8.2:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:20 +03:00
Dmitry Stogov
5e10aa4e5f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:08 +03:00
Dmitry Stogov
3e076ddf06 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:00 +03:00
Dmitry Stogov
cefb228e15 Discard disasm symbols on opcache restart 2022-10-17 11:22:59 +03:00
Kévin Dunglas
e6bfd7e089 Set SA_ONSTACK too when zend signals are disabled and in pcntl
Closes GH-9758.
2022-10-16 23:47:53 +01:00
Tim Düsterhus
d368abb921 Merge branch 'PHP-8.2'
* PHP-8.2:
  Update to actions/checkout@v3 (PHP-8.1)
  Update to actions/checkout@v3 (#9759)
2022-10-16 15:37:47 +02:00
Tim Düsterhus
e8f2fe6745 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update to actions/checkout@v3 (PHP-8.1)
2022-10-16 15:36:30 +02:00
Tim Düsterhus
8cd1b837c1 Update to actions/checkout@v3 (PHP-8.1)
see 629fcb6a0f
2022-10-16 15:35:57 +02:00
Tim Düsterhus
0bde7c513b Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update to actions/checkout@v3 (#9759)
2022-10-16 15:33:48 +02:00
Tim Düsterhus
6c3b148d7a Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Update to actions/checkout@v3 (#9759)
2022-10-16 15:33:22 +02:00
Tim Düsterhus
629fcb6a0f Update to actions/checkout@v3 (#9759)
The relevant difference is that the v3 uses a newer node.js version. GitHub
currently warns when using v2, as the node.js version used is deprecated:

> Node.js 12 actions are deprecated. For more information see:
> https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.
> Please update the following actions to use Node.js 16: actions/checkout,
> actions/checkout
2022-10-16 15:33:07 +02:00
Jakub Zelenka
18fe337bae Fix bug #51056: fread() on blocking stream will block even if data is available
This is applied only on socket connection which already returns
immediately if there is no data in the buffer.
2022-10-16 12:17:47 +01:00
Arnaud Le Blanc
1c1481bbb5 Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  [ci skip] NEWS
  Restore extra_named_params when restoring frozen call stack
2022-10-16 12:48:26 +02:00
Arnaud Le Blanc
2c25dfb440 [ci skip] NEWS 2022-10-16 12:46:25 +02:00
Arnaud Le Blanc
a1295cbfce Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [ci skip] NEWS
  [ci skip] NEWS
  Restore extra_named_params when restoring frozen call stack
2022-10-16 12:45:41 +02:00
Arnaud Le Blanc
e3c40c6829 [ci skip] NEWS 2022-10-16 12:44:05 +02:00
Arnaud Le Blanc
2831e0c624 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  [ci skip] NEWS
  Restore extra_named_params when restoring frozen call stack
2022-10-16 12:43:34 +02:00
Arnaud Le Blanc
f702f87f70 [ci skip] NEWS 2022-10-16 12:43:21 +02:00
Arnaud Le Blanc
86e1fea39a Restore extra_named_params when restoring frozen call stack 2022-10-16 12:40:09 +02:00
Kévin Dunglas
c8c09b4aae opcache: add FrankenPHP to the allow list 2022-10-15 14:30:17 +02:00
David Carlier
35b5aceff3 SO_ATTACH_REUSEPORT_CBPF filter update. SDK_AD_QUEUE support to attach to a queue.
Closes #9690
2022-10-15 11:22:26 +01:00
Arnaud Le Blanc
69eb38b460 [ci skip] UPGRADING 2022-10-14 12:25:17 +02:00
Christoph M. Becker
d758f58672 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:08:50 +02:00
Christoph M. Becker
aba82c74d9 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:08:34 +02:00
Christoph M. Becker
24c297086d Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:00:36 +02:00
Christoph M. Becker
e440e37fa8 Fix GH-9720: Null pointer dereference while serializing the response
When traversing the result array, we need to cater to `param_name`
possibly being `NULL`.  Prior to PHP 7.0.0, this was implicitly done
because `param_name` was of type `char*`.

Closes GH-9739.
2022-10-13 15:56:08 +02:00
juan-morales
fca9e23a6f QA - filter_input - LCOV - FILTER_NULL_ON_FAILURE
Closes GH-9737.
2022-10-13 13:59:48 +02:00
Máté Kocsis
a4fd2609ce Declare ext/standard constants in stubs - part 9 (#9717) 2022-10-13 13:13:36 +02:00
Christoph M. Becker
e4e6c3e960 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix potential heap corruption due to alignment mismatch
2022-10-13 11:48:26 +02:00
Christoph M. Becker
3193c037d2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix potential heap corruption due to alignment mismatch
2022-10-13 11:48:07 +02:00
Christoph M. Becker
7e14d2466a Fix potential heap corruption due to alignment mismatch
The fix for bug 63327[1] changed the extra size of mysqlnd allocations
from `sizeof(size_t)` to the properly aligned values; however, the
allocation in `_mysqlnd_pestrdup()` has apparently been overlooked,
which (currently) causes detectable heap corruption when running
mysqli_get_client_stats.phpt on 32bit Windows versions.

[1] <338a47bb85>

Closes GH-9724.
2022-10-13 11:47:24 +02:00
Christoph M. Becker
dc817a6f90 Merge branch 'PHP-8.2'
* PHP-8.2:
2022-10-13 11:44:17 +02:00
Christoph M. Becker
3b5a9da2dc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Updated to version 2022.5 (2022e)
  Updated to version 2022.5 (2022e)
2022-10-13 11:43:33 +02:00
Máté Kocsis
1254969274 Declare remaining Zend constants in stubs (#9730) 2022-10-12 22:43:36 +02:00
Máté Kocsis
66f3b5ffb2 Declare main constants in stubs - part 3 (#9731) 2022-10-12 14:42:22 +02:00
Máté Kocsis
f6ef5fbb0a Declare ext/standard constants in stubs - part 12 (#9729) 2022-10-12 13:04:14 +02:00
Máté Kocsis
c59e94fc9d Declare ext/stanard constants in stubs - part 11 (#9728) 2022-10-12 12:07:03 +02:00
Máté Kocsis
fc11a8abcb Declare XML_SAX_IMPL constant in stubs (#9732) 2022-10-12 11:42:24 +02:00
Derick Rethans
fd3d3117b5 Updated to version 2022.5 (2022e) 2022-10-12 09:37:31 +01:00
Derick Rethans
7965210c0b Empty merge 2022-10-12 09:37:31 +01:00
Derick Rethans
577b904fdc Updated to version 2022.5 (2022e) 2022-10-12 09:37:30 +01:00
Derick Rethans
0ff07838ed Empty merge 2022-10-12 09:37:30 +01:00
Derick Rethans
24963be8ef Updated to version 2022.5 (2022e) 2022-10-12 09:37:28 +01:00
Máté Kocsis
433ed0973a Declare ext/standard constants in stubs - part 10 (#9719) 2022-10-12 08:16:19 +02:00
Ben Ramsey
2c6423385c Merge branch 'PHP-8.2' 2022-10-11 19:51:50 -04:00