1
0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Commit Graph

129783 Commits

Author SHA1 Message Date
Dmitry Stogov
8f3c1940f9 Merge branch 'PHP-8.2'
* PHP-8.2:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2022-09-19 17:19:38 +03:00
Dmitry Stogov
5a868022e7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2022-09-19 17:19:28 +03:00
Dmitry Stogov
20d1d234ca Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
2022-09-19 17:19:19 +03:00
Dmitry Stogov
e488f7b0eb Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning. 2022-09-19 17:17:53 +03:00
Derick Rethans
6d6e455000 Merge branch 'PHP-8.2' 2022-09-19 14:43:42 +01:00
Derick Rethans
a99d406da0 Merge branch 'allow-external-diff-tool' into PHP-8.2 2022-09-19 14:43:35 +01:00
Derick Rethans
d7d6794f94 Use external diff tool if TEST_PHP_DIFF_CMD env var is set 2022-09-19 14:43:16 +01:00
Dmitry Stogov
4d5c6ca32d Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix SSA construction and type inference
2022-09-19 15:46:08 +03:00
Dmitry Stogov
7496a400aa Fix SSA construction and type inference
Fixes oss-fuzz #51476
2022-09-19 15:45:34 +03:00
Christoph M. Becker
5fdf95b217 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9574: SOCKET_EPROTO constant missing since PHP 8.2 dev
2022-09-19 14:42:03 +02:00
Christoph M. Becker
4767b0999d Fix GH-9574: SOCKET_EPROTO constant missing since PHP 8.2 dev
Closes GH-9575.
2022-09-19 14:41:30 +02:00
Dmitry Stogov
31dca2ecec Merge branch 'PHP-8.2'
* PHP-8.2:
  Fixed warning
2022-09-19 13:13:04 +03:00
Dmitry Stogov
33918f999d Fixed warning 2022-09-19 13:12:49 +03:00
Dmitry Stogov
7fdf896d4b Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix memory leak
2022-09-19 13:04:18 +03:00
Dmitry Stogov
c0d49b7c7d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix memory leak
2022-09-19 13:04:09 +03:00
Dmitry Stogov
8a1f7fa721 Fix memory leak
Fixes oss-fuzz #51451
2022-09-19 13:03:24 +03:00
Anatol Belski
79f463496b Merge branch 'PHP-8.2'
* PHP-8.2:
  NEWS: Add entry for GH-8805
  NEWS: Add entry for GH-8805
2022-09-18 15:59:42 +02:00
Anatol Belski
eba3be4d38 NEWS: Add entry for GH-8805
[ci skip]

Signed-off-by: Anatol Belski <ab@php.net>
2022-09-18 15:43:12 +02:00
Anatol Belski
224ca5588a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  NEWS: Add entry for GH-8805
2022-09-18 15:40:14 +02:00
Anatol Belski
54701ea3e7 NEWS: Add entry for GH-8805
[ci skip]

Signed-off-by: Anatol Belski <ab@php.net>
2022-09-18 15:39:07 +02:00
Anatol Belski
3021da54be Merge branch 'PHP-8.2'
* PHP-8.2:
  fileinfo: magic: Backport mime type support for woff/woff2 fonts
2022-09-18 14:44:42 +02:00
Anatol Belski
796fdb4bcc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  fileinfo: magic: Backport mime type support for woff/woff2 fonts
2022-09-18 14:44:00 +02:00
Anatol Belski
34fa65a6c2 fileinfo: magic: Backport mime type support for woff/woff2 fonts
Upstream patch: 7a821aedc1

Fixes GH-8805.

Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
2022-09-18 14:39:12 +02:00
Nikita Popov
5f0cbcff3a Don't set rpath for fuzzers
We used to use the rpath for loading libonig, but this is both no
longer needed and breaks under SystemSan.
2022-09-17 15:44:58 +02:00
Christoph M. Becker
70f88e5799 Merge branch 'PHP-8.2'
* PHP-8.2:
  Work around dl(mysqli) issue with OPcache on AppVeyor
2022-09-17 12:07:26 +02:00
Christoph M. Becker
04eb8b4499 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Work around dl(mysqli) issue with OPcache on AppVeyor
2022-09-17 12:06:54 +02:00
Christoph M. Becker
bfb4ee7c98 Work around dl(mysqli) issue with OPcache on AppVeyor
As described in #8508, if OPcache is enabled, ext/mysqli can't be
dl()'d; we work around that by loading the extension on startup.

Closes GH-9557.
2022-09-17 12:05:35 +02:00
Ilija Tovilo
80d99a6a45 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix UB pointer arithmetics on NULL
2022-09-16 18:25:33 +02:00
Ilija Tovilo
fe0eaf107a Fix UB pointer arithmetics on NULL
Closes GH-9559
2022-09-16 18:24:39 +02:00
Ilija Tovilo
dd8064c4d6 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix test with POSIX_RLIMIT_FSIZE and gcov
2022-09-16 17:15:56 +02:00
Ilija Tovilo
3f1e9235e1 Fix test with POSIX_RLIMIT_FSIZE and gcov 2022-09-16 17:15:17 +02:00
Arnaud Le Blanc
2c1aa50c82 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix test in "DEBUG_NTS_OPCACHE Without interned strings" build
2022-09-16 16:53:10 +02:00
Arnaud Le Blanc
ac54bfb17c Fix test in "DEBUG_NTS_OPCACHE Without interned strings" build 2022-09-16 16:51:27 +02:00
Ilija Tovilo
17b0e498e5 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix class link observer with file_cache_only=1
2022-09-16 14:15:43 +02:00
Ilija Tovilo
6622c54c53 Fix class link observer with file_cache_only=1
Previously, notify would only get called on classes with CE_CACHE.
However, during compilation class names are non-permanent which won't
get a CE_CACHE and thus wouldn't not get notified.

Closes GH-9550
2022-09-16 14:15:05 +02:00
Ilija Tovilo
60b2c3f36f Merge branch 'PHP-8.2'
* PHP-8.2:
  Backport skipping of ext/date/tests/gh-124.phpt on ASAN
2022-09-16 01:29:51 +02:00
Ilija Tovilo
dbbb7427be Backport skipping of ext/date/tests/gh-124.phpt on ASAN 2022-09-16 01:29:12 +02:00
Nikita Popov
1d28a7be24 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix serialization of empty SplFixedArray
2022-09-15 22:36:40 +02:00
Nikita Popov
70ad93dd6e Fix serialization of empty SplFixedArray
Avoid null pointer deref.
2022-09-15 22:36:19 +02:00
Remi Collet
59894c7bf1 Merge branch 'PHP-8.2'
* PHP-8.2:
  zip version bump to 1.21.1
  remove LIBZIP_VERSION constant def from stub
2022-09-15 16:42:13 +02:00
Remi Collet
ef4c20dea9 zip version bump to 1.21.1 2022-09-15 16:41:54 +02:00
Remi Collet
946cdb8ad1 remove LIBZIP_VERSION constant def from stub 2022-09-15 16:41:22 +02:00
Ilija Tovilo
75409cd127 Merge branch 'PHP-8.2'
* PHP-8.2:
  Skip nightly coverage job in forks
2022-09-15 10:42:24 +02:00
Ilija Tovilo
ca03a56d53 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip nightly coverage job in forks
2022-09-15 10:42:08 +02:00
Ilija Tovilo
308ad7f017 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Skip nightly coverage job in forks
2022-09-15 10:41:53 +02:00
Ilija Tovilo
0451eded79 Skip nightly coverage job in forks 2022-09-15 10:41:17 +02:00
Ilija Tovilo
743d3780c6 Add clang ASAN/UBSAN push job
Closes GH-9507
2022-09-14 23:55:46 +02:00
Ilija Tovilo
ed202b2a50 Merge branch 'PHP-8.2'
* PHP-8.2:
  Don't throw CompileError after parsing
2022-09-14 23:06:05 +02:00
Ilija Tovilo
7e860eaef0 Don't throw CompileError after parsing
Aborting parsing is not safe, a fatal error is necessary.

See b9f7123c5e
2022-09-14 23:05:41 +02:00
Ilija Tovilo
a2f7c9db37 Merge branch 'PHP-8.2'
* PHP-8.2:
  Skip 64-bit specific date test on 32-bit
2022-09-14 23:04:15 +02:00