php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
134,205 Commits 549 Branches 1,485 Tags
febbbfac78d194bdedadff8121a6726711915bee
Commit Graph

134205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
武田 憲太郎 febbbfac78 Fix the MySQL Server version used for testing to (#14120) 
closes #14120
 2024-05-04 07:49:07 +09:00
Matteo Beccati f26b964332 Merge branch 'PHP-8.2' into PHP-8.3 2024-05-02 19:53:27 +02:00
Matteo Beccati 6fed9a9a7e Stick to mysql 8.3 for the time being 
MySQL 8.4 does not load the 'mysql_native_password' plugin by default
and I couldn't figure out how to initialise the container to load it.
 2024-05-02 19:53:05 +02:00
Peter Kokot 49b5ab2057 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix tests for glibc 2.39 (#14097)
 2024-05-01 20:43:42 +02:00
Peter Kokot b6b9eab68e Fix tests for glibc 2.39 (#14097) 
2.39 has fixed inconsistent (mon_)grouping formats in localedata:

* https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;hb=refs/tags/glibc-2.39#l237
* https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/locales/en_AU;hb=refs/tags/glibc-2.39#l65

For en_AU locale now it returns array of 1 item instead of 2 for
grouping and mon_grouping.

Since this is upstream change depending on the system, this only syncs
tests for such case.
 2024-05-01 20:43:00 +02:00
David Carlier ff6e3b6f76 Merge branch 'PHP-8.2' into PHP-8.3 2024-05-01 13:59:10 +01:00
David Carlier 74843947f4 sapi/cgi: fix buffer limit on windows. 
MSDN recommends dropping the deprecated `read` in favor of `_read`.
Also, the buffer size limit is INT_MAX.

Close GH-14022
 2024-05-01 13:58:53 +01:00
Niels Dossche 461d890f0a Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix crash when calling childNodes next() when iterator is exhausted
  Fix references not handled correctly in C14N
  Fix crashes when entity declaration is removed while still having entity references
 2024-04-30 22:38:32 +02:00
Niels Dossche 2dbe2d62b3 Fix crash when calling childNodes next() when iterator is exhausted 
Closes GH-14091.
 2024-04-30 22:30:58 +02:00
Niels Dossche 30a0b0359e Fix references not handled correctly in C14N 
Closes GH-14090.
 2024-04-30 22:30:28 +02:00
Niels Dossche e878b9f390 Fix crashes when entity declaration is removed while still having entity references 
libxml doesn't do reference counting inside its node types. It's
possible to remove an entity declaration out of the document, but then
entity references will keep pointing to that stale declaration. This
will cause crashes.

One idea would be to check when a declaration is removed, to trigger a
hook that updates all references. However this means we have to keep
track of all references somehow, which would be a high-overhead
solution. The solution in this patch makes sure that the fields are
always updated before they are read.

Closes GH-14089.
 2024-04-30 22:29:44 +02:00
Ilija Tovilo 5bac4a6471 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix __SANITIZE_ADDRESS__ redeclaration warning
 2024-04-29 16:14:16 +02:00
Ilija Tovilo d670e131df Fix __SANITIZE_ADDRESS__ redeclaration warning 2024-04-29 16:13:49 +02:00
Jakub Zelenka bab75e1f5c PHP 8.3 is now for PHP-8.3.8-dev 2024-04-23 19:27:29 +01:00
Sergey Panteleev 3a252b2849 Merge branch 'refs/heads/PHP-8.2' into PHP-8.3 
* refs/heads/PHP-8.2:
  PHP-8.2 is now for PHP 8.2.20-dev

# Conflicts:
#	Zend/zend.h
#	configure.ac
#	main/php_version.h
 2024-04-23 17:23:26 +03:00
Sergey Panteleev 3b5321dffe PHP-8.2 is now for PHP 8.2.20-dev 2024-04-23 17:22:54 +03:00
Peter Kokot 71aae5a17e Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13727: Building with -Werror=strict-prototypes (#14029)
 2024-04-22 21:22:28 +02:00
Peter Kokot 44775b7617 Fix GH-13727: Building with -Werror=strict-prototypes (#14029) 
This is addon to the GH-13727 bug fix. When configuring the build with:

  ./configure CFLAGS=-Werror=strict-prototypes

libtool check for parsing nm command would fail:

  checking command to parse /usr/bin/nm -B output from cc object... failed

Upstream libtool has this specific check already fixed. Note that this
works only with Autoconf version 2.72 and later and is preparation for
future compilers that might have this error enabled by default.
 2024-04-22 21:21:40 +02:00
Ilija Tovilo 5899cabff0 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Temporary reset filename and lineno override before autoload
 2024-04-22 10:57:47 +02:00
SATO Kentaro f8b9030b4e Temporary reset filename and lineno override before autoload 
Closes GH-10232
Closes GH-13313
 2024-04-22 10:56:45 +02:00
Peter Kokot f28ddec540 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix erroneous dnl appended in configure (#14013)
 2024-04-21 17:23:58 +02:00
Peter Kokot 7d3d8de1f3 Fix erroneous dnl appended in configure (#14013) 
This is a backport of commit 03f15534a1 to
PHP-8.2 due to GH-14002 and fixes the PHP_CXX_COMPILE_STDCXX check in
ext/intl whether the specified C++ standard is mandatory or optional.

The `dnl` (Discard to Next Line) M4 macro in this combination of `m4_if`
macros and arguments isn't properly replaced and a literal `dnl` string
is appended in the configure script. The `[]dnl` works ok.
 2024-04-21 17:23:22 +02:00
Ilija Tovilo 2f64d07337 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Backport 0e7ef95 and 4f0d4c0
 2024-04-21 16:13:21 +02:00
Ilija Tovilo 891e4a5a34 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Backport 0e7ef95 and 4f0d4c0
 2024-04-21 16:12:18 +02:00
Ilija Tovilo 469ad32581 [skip ci] Backport 0e7ef95 and 4f0d4c0 2024-04-21 16:11:55 +02:00
David Carlier 2636104a83 Merge branch 'PHP-8.2' into PHP-8.3 2024-04-20 17:11:33 +01:00
David Carlier 42443b4c2e ext/session: fix _read/_write buffer limit. 
MSDN pages mention the buffer size upper limit is INT_MAX not UINT_MAX.
inspired by GH-13205.

Close GH-14017
 2024-04-20 17:11:03 +01:00
Saki Takamachi 43064160c4 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13998: Manage refcount of agg_context->val correctly (#14004)
 2024-04-20 22:34:31 +09:00
Saki Takamachi 2a1aa8cac5 Fix GH-13998: Manage refcount of agg_context->val correctly (#14004) 
When step_callback fails, agg_context->val is passed dtor, but agg_context->val
is also used in final_callback regardless of the success/failure of step_callback,
so should not call dtor.

closes #14004
fixes #13998
 2024-04-20 22:33:25 +09:00
Ilija Tovilo 4393198bbd Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls()
 2024-04-19 20:06:15 +02:00
Ilija Tovilo b3e26c3036 Fix missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls() 
Fixes GH-14003
 2024-04-19 20:04:51 +02:00
Jakub Zelenka 353571e29b Merge branch 'PHP-8.2' into PHP-8.3 2024-04-19 14:09:53 +01:00
Jakub Zelenka 04b864e566 Fix GH-13806: openssl_x509_parse_basic test fails with OpenSSL 3.2+ (#13961) 
Closes GH-13961
 2024-04-19 14:09:22 +01:00
David Carlier e94f3a7b40 Merge branch 'PHP-8.2' into PHP-8.3 2024-04-19 10:07:11 +01:00
David Carlier cc46a4e6b5 ext/intl: level up c++ runtime std for icu 74 and onwards. 
to align with what is required to build icu 74 itself.

Close GH-14002
 2024-04-19 10:04:25 +01:00
Saki Takamachi dd5cdfd645 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13984: Buffer size is now checked before memcmp (#13991)
 2024-04-18 08:37:55 +09:00
Saki Takamachi fda91a0543 Fix GH-13984: Buffer size is now checked before memcmp (#13991) 
Fixed an issue where a buffer overflow occurred when a string shorter than
`:memory:` was passed as the db name of pdo_sqlite.

fixed #13984
closes #13991
 2024-04-18 08:35:50 +09:00
Ilija Tovilo 3d86d9acc1 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Add missing COMPILE_IGNORE_OTHER_FILES check for static calls
 2024-04-17 22:39:48 +02:00
Ilija Tovilo 1acd7a0919 Add missing COMPILE_IGNORE_OTHER_FILES check for static calls 
Closes GH-13986
 2024-04-17 22:39:05 +02:00
Niels Dossche 90388233ed Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13978: Fuzzer readme still mentions obsolete --enable-json flag (#13983)
 2024-04-16 22:17:42 +02:00
Niels Dossche 093d334684 Fix GH-13978: Fuzzer readme still mentions obsolete --enable-json flag (#13983) 
[ci skip]
 2024-04-16 22:16:51 +02:00
Arnaud Le Blanc 812d19d67e [ci skip] NEWS 2024-04-16 14:20:05 +02:00
Arnaud Le Blanc c12fd0873b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [ci skip] NEWS
  fix: zend-max-execution-timers with negative or high timeout value (#13942)
  Use return value of getpwuid_r(), not errno (#13969)
 2024-04-16 14:19:35 +02:00
Arnaud Le Blanc d47aaacf3c [ci skip] NEWS 2024-04-16 14:18:48 +02:00
Kévin Dunglas f6e8145b47 fix: zend-max-execution-timers with negative or high timeout value (#13942) 
Align the behavior of zend-max-execution-timers with other timeout impls: Negative or very high timeout values are equivalent to no timeout
 2024-04-16 14:13:36 +02:00
Arnaud Le Blanc 32efc76c32 Use return value of getpwuid_r(), not errno (#13969) 2024-04-16 14:08:28 +02:00
Niels Dossche 550e0ceb79 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13931: Applying zero offset to null pointer in Zend/zend_opcode.c
 2024-04-15 19:39:59 +02:00
Niels Dossche c3acfb1b57 Fix GH-13931: Applying zero offset to null pointer in Zend/zend_opcode.c 
In the test cases, the compiler bails out due to a fatal error.
The data structures used by the compiler will contain stale values.
In particular, for the test case CG(loop_var_stack) will contain data.
The next compilation will incorrectly use elements from the previous
stack.
To solve this, we reset part of the compiler data structures.
We don't do a full re-initialization via init_compiler() because that will
also reset streams and resources.

Closes GH-13938.
 2024-04-15 19:39:05 +02:00
Ilija Tovilo a351121e85 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed missed exception
 2024-04-15 17:44:03 +02:00
Dmitry Stogov 5f9b9c4e23 Fixed missed exception 2024-04-15 17:43:54 +02:00