1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Commit Graph

62798 Commits

Author SHA1 Message Date
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: https://github.com/file/file/commit/7a821aedc144f70ec848ea632a64db74b79563c1

Fixes GH-8805.

Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
2022-09-18 14:39:12 +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 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 743d3780c6 Add clang ASAN/UBSAN push job
Closes GH-9507
2022-09-14 23:55:46 +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
Ilija Tovilo 2cdf7b91e5 Skip 64-bit specific date test on 32-bit 2022-09-14 23:03:34 +02:00
Ilija Tovilo 12b9196042 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix cleaup of fileinfo test
2022-09-14 22:19:55 +02:00
Ilija Tovilo 52850a4c0f Fix cleaup of fileinfo test 2022-09-14 22:18:59 +02:00
Derick Rethans b49f5ac2be Merge branch 'PHP-8.2' 2022-09-14 16:45:27 +01:00
Derick Rethans 7448ee365c Add test case for timelib #124 2022-09-14 16:44:46 +01:00
Derick Rethans f8b27c73c9 Use 'const' for fixed API 2022-09-14 16:40:06 +01:00
Derick Rethans 06d4c70e51 Integrate timelib 2022.02
- Fixed #124: Can't parse INT_MIN
- Added a new API, timelib_get_time_zone_offset_info, which reduces allocation
  speeding up algorithms (Alberto Massari)
- Accelerate the do_range_limit_days algorythm by advancing multiple months in
  a single call (Alberto Massari)

Including fixes from 2021.17:

- Fixed 'const' and other compiler warnings
- Use new 'PACKRAT' format to prevent old timestamps from becoming incorrect
- New 2022b data file
- Fixed PHP GH-9165: strtotime translates a date-time with DST/non-DST hour
  differently
2022-09-14 16:33:05 +01:00
Derick Rethans 0dcd098dfa Merge remote-tracking branch 'derickr/timelib-2021-17-integration' into PHP-8.1 2022-09-14 16:25:43 +01:00
Christoph M. Becker b75542a8c8 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix: sockets constants
2022-09-14 15:27:55 +02:00
Bruce Dou 9f7e27a86b Fix: sockets constants
Closes GH-9533.
2022-09-14 15:27:29 +02:00
Derick Rethans dd365b044a Add 'const' to match actual API 2022-09-14 11:02:26 +01:00
Derick Rethans e5b4624b8b Fixed #9165: strtotime translates a date-time with DST/non-DST hour differently based on default timezone 2022-09-14 10:42:42 +01:00
Derick Rethans 4a5202293b Merge timelib 2021.17 2022-09-14 10:40:59 +01:00
Bob Weinand d1fc0017c9 Revert "Fix compilation on MacOS"
This reverts commit 800c6672e5.

Reverted along with a01dd9feda.
2022-09-14 11:28:06 +02:00
Bob Weinand 5a0b68bed7 Revert "Store default object handlers alongside the class entry"
This reverts commit 9e6eab3c13.

Reverted along a01dd9feda.
2022-09-14 11:18:14 +02:00
Bob Weinand a01dd9feda Revert "Port all internally used classes to use default_object_handlers"
This reverts commit 94ee4f9834.

The commit was a bit too late to be included in PHP 8.2 RC1. Given it's a massive ABI break, we decide to postpone the change to PHP 8.3.
2022-09-14 11:13:23 +02:00
Christoph M. Becker 80063a5a90 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix oci_success_with_info.phpt test random failures
2022-09-13 17:17:59 +02:00
Christoph M. Becker fee4bdb595 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix oci_success_with_info.phpt test random failures
2022-09-13 17:17:28 +02:00
Michael Voříšek 7fd14eb08b Fix oci_success_with_info.phpt test random failures
Closes GH-9525.
2022-09-13 17:15:36 +02:00
George Peter Banyard 189159bfcd Merge branch 'PHP-8.2' 2022-09-13 13:57:18 +01:00
George Peter Banyard 951bd74038 Do early returns in xml.c
This reduces nesting clarying what preconditions are needed in each of the handler functions
2022-09-13 13:56:52 +01:00
George Peter Banyard 6aef13402e Mark _xml_decode_tag() as taking a const XML_Char*
As this is always the case and this removes unnecessary pointer casts
2022-09-13 13:56:52 +01:00
George Peter Banyard 0b8ad94b91 Refactor _xml_add_to_info()
Mark char* as const, and compute it's length once to save an expensive strlen() call
2022-09-13 13:56:52 +01:00
Christoph M. Becker 9d46d53d29 Merge branch 'PHP-8.2'
* PHP-8.2:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:27:26 +02:00
Christoph M. Becker 5b8f379fb6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:26:45 +02:00
Christoph M. Becker cd927ef634 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:25:11 +02:00
Michael Voříšek 9a73ec0367 Always skip randomly failing OCI8 extauth tests
This might be caused by an issue with the Oracle Instant Client
libraries[1]; we skip the tests for the time being.

[1] <https://github.com/php/php-src/pull/9524#issuecomment-1244409815>

Closes GH-9524.
2022-09-13 14:21:23 +02:00
George Peter Banyard 18b7e43106 Merge branch 'PHP-8.2' 2022-09-13 12:51:19 +01:00
George Peter Banyard bacbfb81ab Merge branch 'PHP-8.1' into PHP-8.2 2022-09-13 12:50:38 +01:00
George Peter Banyard 71e198be25 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 12:45:42 +01:00
George Peter Banyard 47500f3300 Fix GH-9421 Incorrect argument number for ValueError in NumberFormatter
Closes GH-9489
2022-09-13 12:42:58 +01:00
George Peter Banyard 408f1cc2a7 Merge branch 'PHP-8.2' 2022-09-13 11:35:59 +01:00
George Peter Banyard 79b011bdd9 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-13 11:35:12 +01:00