istiak101
bf2867bc72
Fix FSF address & update year to 2022
...
FSF mailing address was changed long time ago. This patch updates that address. Also updated year from 2021 to 2022.
Closes GH-8009.
2022-03-19 18:25:29 +01:00
Max Kellermann
82de4fcfe6
ext/opcache/ZendAccelerator: remove redundant check ( #8222 )
...
The "accelerator_enabled" flag has been checked already in the
previous "if".
2022-03-19 13:51:40 +00:00
David CARLIER
c9385ee1ad
zend_mm_map_fixed using MAP_TRYFIXED on NetBSD.DragonFlyBSD
...
attempts to map on addr but does not replace it if already present.
Note on OpenBSD it has no effect, addr is used just as a hint.
Closes GH-7923.
2022-03-19 12:12:00 +01:00
Dmitry Stogov
e85f812378
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix missing exception handling
2022-03-18 18:56:58 +03:00
Dmitry Stogov
83ab9cf871
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix missing exception handling
2022-03-18 18:56:02 +03:00
Dmitry Stogov
3d6a7e2bd5
JIT: Fix missing exception handling
...
Fixes oss-fuzz #45649
2022-03-18 18:54:47 +03:00
Christoph M. Becker
20c0eb47df
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8208: mb_encode_mimeheader: $indent functionality broken
2022-03-17 17:35:06 +01:00
Christoph M. Becker
5003831260
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8208: mb_encode_mimeheader: $indent functionality broken
2022-03-17 17:34:31 +01:00
Christoph M. Becker
d0417ebc93
Fix GH-8208: mb_encode_mimeheader: $indent functionality broken
...
We also need to factor in the indent, when getting the encoder result.
Closes GH-8213.
2022-03-17 17:31:58 +01:00
George Peter Banyard
ec53e17adf
Use more appropriate types in JSON extension ( #8194 )
...
Mainly zend_result
2022-03-16 22:53:41 +00:00
Christoph M. Becker
27be6c34b5
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix typo (--EXTENSION-- → --EXTENSIONS--)
2022-03-14 15:15:19 +01:00
Christoph M. Becker
b92ae85b25
Fix typo (--EXTENSION-- → --EXTENSIONS--)
2022-03-14 15:14:27 +01:00
Christoph M. Becker
dad214c370
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8068: mysqli_fetch_object creates inaccessible properties
2022-03-14 14:30:06 +01:00
Christoph M. Becker
aef65393be
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8068: mysqli_fetch_object creates inaccessible properties
2022-03-14 14:29:30 +01:00
Christoph M. Becker
ef29ddcc27
Fix GH-8068: mysqli_fetch_object creates inaccessible properties
...
When fetching into objects, we need to create object style hash tables,
i.e. where numeric column names are stored as string keys instead of
integer keys. Instead of the slightly more efficient alternative to
create the desired hash table in the first place, we go for the more
readable implementation and convert the array style hash table using
`zend_symtable_to_proptable()`.
Co-authored-by: Kamil Tekiela <tekiela246@gmail.com >
Closes GH-8189.
2022-03-14 14:27:04 +01:00
Dmitry Stogov
6c1828775a
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Skip test for preloading
2022-03-14 13:03:51 +03:00
Dmitry Stogov
33eec37830
Skip test for preloading
2022-03-14 13:03:21 +03:00
Dmitry Stogov
d06422670c
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix memory leak
2022-03-14 12:59:13 +03:00
Dmitry Stogov
156d3aedc1
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix memory leak
2022-03-14 12:58:11 +03:00
Dmitry Stogov
2b7431cf5b
Fix memory leak
...
Fixed oss-fuzz #45535
2022-03-14 12:57:37 +03:00
Dmitry Stogov
981ae10bf9
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix register allocation
2022-03-14 11:48:11 +03:00
Dmitry Stogov
2bed115336
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix register allocation
2022-03-14 11:47:27 +03:00
Dmitry Stogov
e20f955e44
JIT: Fix register allocation
...
Fixes oss-fuzz #45487
2022-03-14 11:46:45 +03:00
Dmitry Stogov
efb014dda2
Reset EG(filename_override) after fatal error
...
Fixes oss-fuzz #45492
2022-03-14 11:07:49 +03:00
Dmitry Stogov
0d80bc2abd
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix type store
2022-03-14 09:51:58 +03:00
Dmitry Stogov
2862553de7
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix type store
2022-03-14 09:51:49 +03:00
Dmitry Stogov
9792f0db76
JIT: Fix type store
...
Fixes oss-fuzz #45190
2022-03-14 09:48:58 +03:00
George Peter Banyard
dd62ec065e
Refactor php_next_utf8_char() to use zend_result
2022-03-13 13:48:21 +00:00
Nikita Popov
95ad1d1cbc
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Make DirectoryIterator current() / key() return types tentative
2022-03-12 17:36:52 +01:00
Nikita Popov
d0a0518798
Make DirectoryIterator current() / key() return types tentative
...
Fixes GH-8192.
2022-03-12 17:32:44 +01:00
Ilija Tovilo
0db03c4110
Improve sesson write failure message for user error handlers
...
Closes GH-7787
Closes GH-8186
2022-03-11 15:08:16 +01:00
Christoph M. Becker
6b2187bc79
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8160: ZTS support on Alpine is broken
2022-03-11 14:42:49 +01:00
Christoph M. Becker
0b1bca6b9c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8160: ZTS support on Alpine is broken
2022-03-11 14:41:46 +01:00
Michael Voříšek
2b2aeb989e
Fix GH-8160: ZTS support on Alpine is broken
...
We need to export `__MUSL__` so that phpize builds can see the proper
macro, and also need to fix "_tsrm_ls_cache" usage for musl.
Closes GH-8180.
2022-03-11 14:39:39 +01:00
Dmitry Stogov
df14a07887
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Optimizer: Fix inorrect constant substitution in FETCH_LIST_R
2022-03-11 14:31:32 +03:00
Dmitry Stogov
770a544af4
Optimizer: Fix inorrect constant substitution in FETCH_LIST_R
...
Fixes oss-fuzz #45429
2022-03-11 14:30:27 +03:00
Dmitry Stogov
46c0be5eb2
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Tracing JIT: Eliminate useless guards for CONCAT
2022-03-11 12:43:24 +03:00
Dmitry Stogov
f7608df78d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Tracing JIT: Eliminate useless guards for CONCAT
2022-03-11 12:40:25 +03:00
Dmitry Stogov
6c3816cee5
Tracing JIT: Eliminate useless guards for CONCAT
...
Fixes oss-fuzz #45285
2022-03-11 12:39:10 +03:00
Dmitry Stogov
bf079d0515
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fixed memory leak
2022-03-11 11:33:32 +03:00
Dmitry Stogov
1f5562aa09
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed memory leak
2022-03-11 11:33:01 +03:00
Dmitry Stogov
151d2ac5ae
Fixed memory leak
...
Fixes oss-fuzz #45191
2022-03-11 11:32:23 +03:00
Dmitry Stogov
bfedb4ea91
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix non-reentirant startiong or error recording from error handler
2022-03-11 10:52:13 +03:00
Dmitry Stogov
c6a53f9499
Fix non-reentirant startiong or error recording from error handler
...
Fixes oss-fuzz #45398
2022-03-11 10:50:31 +03:00
Christoph M. Becker
ddb04d4872
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix Solaris builds of ext/sockets
2022-03-10 14:52:48 +01:00
Christoph M. Becker
f16d35cfe9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix Solaris builds of ext/sockets
2022-03-10 14:51:30 +01:00
David Carlier
7eb972c456
Fix Solaris builds of ext/sockets
...
We enable the proper ancillary data handling layout and API.
Closes GH-7859.
2022-03-10 14:48:08 +01:00
Ilija Tovilo
e3ef7bbbb8
Adjust filename/lineno for constant expressions
...
Closes GH-7771
Closes GH-8124
2022-03-09 18:41:04 +01:00
Christoph M. Becker
634b2141de
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8121: SplFileObject - seek and key with csv file inconsistent
2022-03-08 16:59:19 +01:00
Christoph M. Becker
3a71fcf5ca
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8121: SplFileObject - seek and key with csv file inconsistent
2022-03-08 16:57:58 +01:00