php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
125,892 Commits 547 Branches 1,483 Tags
2bf3ac5ed2e26feb2b8877e8dee560d562fd7d98
Commit Graph

125892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
2bf3ac5ed2 Merge branch 'PHP-8.1' 
* PHP-8.1:
  NEWS: Add note for bug #78987
  NEWS: Add note for bug #78987
 2021-09-19 16:38:17 +02:00
Anatol Belski
066eaa2c58 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  NEWS: Add note for bug #78987
  NEWS: Add note for bug #78987
 2021-09-19 16:37:54 +02:00
Anatol Belski
125f305b1d NEWS: Add note for bug #78987 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-19 16:37:33 +02:00
Anatol Belski
c129f573bf Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  NEWS: Add note for bug #78987
 2021-09-19 16:36:25 +02:00
Anatol Belski
49c9fbbfe2 NEWS: Add note for bug #78987 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-19 16:35:26 +02:00
Anatol Belski
20bff2ff02 Merge branch 'PHP-8.1' 
* PHP-8.1:
  fileinfo: Fix test value for s390x on travis-ci
 2021-09-19 16:04:53 +02:00
Anatol Belski
1399e08ab9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Fix test value for s390x on travis-ci
 2021-09-19 16:04:47 +02:00
Anatol Belski
fafdf744fa Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Fix test value for s390x on travis-ci
 2021-09-19 16:04:35 +02:00
Anatol Belski
8f75ab0dfc fileinfo: Fix test value for s390x on travis-ci 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-19 16:02:30 +02:00
Anatol Belski
d09df2a8f6 Merge branch 'PHP-8.1' 
* PHP-8.1:
  fileinfo: Capture more sizes for test as delivered by travis-ci
  fileinfo: Capture more sizes for test as delivered by AppVeyor
 2021-09-18 23:18:52 +02:00
Anatol Belski
62bfadc3b8 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Capture more sizes for test as delivered by travis-ci
  fileinfo: Capture more sizes for test as delivered by AppVeyor
 2021-09-18 23:18:11 +02:00
Anatol Belski
d225770e9e Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Capture more sizes for test as delivered by travis-ci
  fileinfo: Capture more sizes for test as delivered by AppVeyor
 2021-09-18 23:17:41 +02:00
Anatol Belski
6e0acece68 fileinfo: Capture more sizes for test as delivered by travis-ci 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 23:16:38 +02:00
Anatol Belski
e56435c86d fileinfo: Capture more sizes for test as delivered by AppVeyor 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 23:06:57 +02:00
Anatol Belski
429b60416f Merge branch 'PHP-8.1' 
* PHP-8.1:
  fileinfo: Adjust value in test
 2021-09-18 22:53:27 +02:00
Anatol Belski
f88fb1af5f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Adjust value in test
 2021-09-18 22:52:52 +02:00
Anatol Belski
a4f85a5796 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Adjust value in test
 2021-09-18 22:52:30 +02:00
Anatol Belski
0208374ad4 fileinfo: Adjust value in test 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:51:08 +02:00
Anatol Belski
0796fec7de Merge branch 'PHP-8.1' 
* PHP-8.1:
  fileinfo: Fix test skip condition
 2021-09-18 22:39:25 +02:00
Anatol Belski
df5d7ec482 fileinfo: Fix test skip condition 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:36:04 +02:00
Anatol Belski
0863ab9960 Merge branch 'PHP-8.1' 
* PHP-8.1:
  libmagic: Update patch
  fileinfo: Fixed bug #78987 High memory usage during encoding detection
 2021-09-18 22:11:25 +02:00
Anatol Belski
31c908af8e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  libmagic: Update patch
  fileinfo: Fixed bug #78987 High memory usage during encoding detection
 2021-09-18 22:11:06 +02:00
Anatol Belski
3c40d9bf77 libmagic: Update patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:04:32 +02:00
Anatol Belski
2a9a521d71 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Fixed bug #78987 High memory usage during encoding detection
 2021-09-18 22:02:56 +02:00
Anatol Belski
fa96c7e000 fileinfo: Fixed bug #78987 High memory usage during encoding detection 
The default buffer size for the encoding detection is set to 64K.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 21:00:30 +02:00
George Peter Banyard
a51869a202 Fix test by using a format specifier for resource to int conversion 
Surprised this worked for so long
 2021-09-17 23:05:35 +01:00
Dmitry Stogov
93c5321a6a Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fixed incorrect assignment of undefined variable
 2021-09-17 18:43:23 +03:00
Dmitry Stogov
939b91ad93 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fixed incorrect assignment of undefined variable
 2021-09-17 18:43:13 +03:00
Dmitry Stogov
01cfd5e4f9 JIT: Fixed incorrect assignment of undefined variable 2021-09-17 18:35:55 +03:00
Nikita Popov
a6615b3419 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix FETCH_OBJ_IS type inference
 2021-09-17 17:06:00 +02:00
Nikita Popov
bda1ee9511 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix FETCH_OBJ_IS type inference
 2021-09-17 17:05:42 +02:00
Nikita Popov
a49a309386 Fix FETCH_OBJ_IS type inference 
Even if the property is typed, null is still a valid return
value in the BP_VAR_IS case. Other cases will throw instead.
 2021-09-17 17:05:25 +02:00
Dmitry Stogov
4e139cfc4c Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: keep register value across call
 2021-09-17 18:00:52 +03:00
Dmitry Stogov
703bd89f8f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: keep register value across call
 2021-09-17 18:00:42 +03:00
Dmitry Stogov
015cafa38c JIT: keep register value across call 2021-09-17 17:58:24 +03:00
Nikita Popov
d348539039 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Try harder to clean up unreachable loop free block
 2021-09-17 16:33:48 +02:00
Nikita Popov
e0e5b59d2e Try harder to clean up unreachable loop free block 
While we can't drop the loop free, we can drop other instructions
in the same block. We should also indicate that it no longer has
predecessors.
 2021-09-17 16:32:29 +02:00
Dmitry Stogov
ef52ab4a47 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fixed warning when assign undefined variable to property
 2021-09-17 16:30:46 +03:00
Dmitry Stogov
fc0cfd1223 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fixed warning when assign undefined variable to property
 2021-09-17 16:30:26 +03:00
Dmitry Stogov
04209de93c JIT: Fixed warning when assign undefined variable to property 2021-09-17 16:22:06 +03:00
Dmitry Stogov
a82cfc27fc Merge branch 'PHP-8.1' 
* PHP-8.1:
  Tracing JIT: Use packed array guards for ASSIGN_DIM_OP and allow to move them out of loops.
 2021-09-17 14:33:57 +03:00
Dmitry Stogov
e5541c943a Tracing JIT: Use packed array guards for ASSIGN_DIM_OP and allow to move them out of loops. 2021-09-17 14:33:04 +03:00
Christoph M. Becker
e04c7eb1ca Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix OOB read due to timezone_open() with 5 digit offset
 2021-09-17 13:31:15 +02:00
Christoph M. Becker
a30c12184e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix OOB read due to timezone_open() with 5 digit offset
 2021-09-17 13:30:58 +02:00
Christoph M. Becker
70e94379f3 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix OOB read due to timezone_open() with 5 digit offset
 2021-09-17 13:29:27 +02:00
Christoph M. Becker
fac3fbcb07 Fix OOB read due to timezone_open() with 5 digit offset 
This has been reported as bug #78984, and is generally and properly
fixed as of timelib 2020.3 (PHP-8.0).  However, it is not fixed in
PHP-7.4, where the test results in an OOB read, and an unterminated
C string when calling `::getName()`.  Therefore, we apply a minimal
fix which just avoids this dangerous behavior.
 2021-09-17 13:18:51 +02:00
Dmitry Stogov
e0f9010e22 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fixed jump to undefined label
 2021-09-17 13:24:52 +03:00
Dmitry Stogov
beba96dd99 JIT: Fixed jump to undefined label 2021-09-17 13:23:58 +03:00
Nikita Popov
5ce32368f2 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix SEND_USER with ref arg
 2021-09-17 12:18:27 +02:00
Nikita Popov
92f808b8bc Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix SEND_USER with ref arg
 2021-09-17 12:18:16 +02:00