php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
130,596 Commits 549 Branches 1,485 Tags
40ae6294620d1c413bc1a07da4ff38f80addb35b
Commit Graph

130596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilija Tovilo 40ae629462 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Windows CI log verbosity, CI bat file guard
 2023-03-16 00:05:21 +01:00
Michael Voříšek f42e56286a Windows CI log verbosity, CI bat file guard 
Closes GH-10817
 2023-03-16 00:04:53 +01:00
Ilija Tovilo 6343975f34 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Another attempt to fix MSAN nightly on master
 2023-03-15 23:38:09 +01:00
Ilija Tovilo 471105abd7 Another attempt to fix MSAN nightly on master 2023-03-15 23:37:36 +01:00
Michael Voříšek 5239f9fc86 Remove CTE flag from array_diff_ukey(), which was added by mistake 
This was accidentally added in GH-7780, but since it takes a callable
argument, this flag is useless on this function.

Closes GH-10859.
 2023-03-15 21:40:11 +01:00
Niels Dossche ff2f882c09 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix missing and inconsistent error check on SQLAllocHandle
 2023-03-15 21:38:12 +01:00
nielsdos c4c8d6ced7 Fix missing and inconsistent error check on SQLAllocHandle 
* Missing check: SQLAllocHandle() for the environment wasn't checked in
  pdo_odbc_handle_factory(). Add a check similar to the other ones for
  SQLAllocHandle().
* Inconsistent check: one of the SQLAllocHandle() calls wasn't checked
  for SQL_SUCCESS_WITH_INFO. However, looking at the other uses and the
  documentation we should probably check this as well.

Furthermore, since there was a mix of "SQLAllocHandle: reason" and
"SQLAllocHandle (reason)" in the error reporting, I made them
consistently use the first option as that seems to be the most used for
error reporting in this file.

Closes GH-10740.
 2023-03-15 21:36:50 +01:00
Remi Collet 420469bd25 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  remove assert raising strange behavior with GCC 10
 2023-03-15 09:06:05 +01:00
Remi Collet bdf2f722ca remove assert raising strange behavior with GCC 10 2023-03-15 09:05:44 +01:00
Ilija Tovilo 70c29f84b1 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Skip upload_2G.phpt on Cirrus
 2023-03-15 02:11:49 +01:00
Ilija Tovilo 84e7d4a3c8 [skip ci] Skip upload_2G.phpt on Cirrus 2023-03-15 02:11:11 +01:00
Ilija Tovilo 1e434fbcd8 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Move ARM64 build to Cirrus
 2023-03-15 01:37:31 +01:00
Ilija Tovilo ccca59728e Move ARM64 build to Cirrus 
Travis is very unreliable lately

Closes GH-10795
 2023-03-15 01:35:01 +01:00
Ilija Tovilo ca7c7e9c05 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  use_tls=0 on MSAN
 2023-03-14 17:43:02 +01:00
Ilija Tovilo 63525ee600 use_tls=0 on MSAN 
Attempt to fix MSAN failure in CI

Closes GH-10851
 2023-03-14 17:42:23 +01:00
Remi Collet f575027b56 avoid test file being consider binary 2023-03-14 15:54:38 +01:00
Niels Dossche ae39069051 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix module shutdown crash during ZTS JIT shutdown
 2023-03-13 20:12:30 +01:00
Niels Dossche b3e28e2290 Fix module shutdown crash during ZTS JIT shutdown 
Commit a21195650e fixed a leak by adding a TSRM destructor for the
JIT globals in ZTS mode. In case the main thread shuts down the TSRM, it
will call all the destructors. The JIT globals destructor will be
invoked, but will always access the main thread globals using JIT_G.
This means that instead of freeing the JIT globals in the different
threads, the one in the main thread is freed repeatedly over and over,
crashing PHP. Fix it by always passing the pointer instead of relying on
JIT_G.

Closes GH-10835.
 2023-03-13 20:12:13 +01:00
Bob Weinand ce2000d9be Merge branch 'PHP-8.1' of github.com:php/php-src into PHP-8.2 2023-03-13 12:39:15 +01:00
Bob Weinand 1015f1ff61 Add test, fix x86 JIT 
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2023-03-13 12:36:59 +01:00
Bob Weinand c53e8d3e30 Handle zend_execute_internal in JIT 2023-03-13 12:36:59 +01:00
Derick Rethans 2d3aa8a5c4 Fixed test for GH-10147 2023-03-13 11:23:40 +00:00
Derick Rethans 4f4ce4f96b Merge remote-tracking branch 'derickr/ossfuzz-56931' into PHP-8.2 2023-03-13 11:03:43 +00:00
Derick Rethans ce5f75fb6f Fixed oss-fuzz #56931 2023-03-13 09:38:11 +00:00
Ilija Tovilo b1a49ff053 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix RC1 assumption for typed properties with __get
 2023-03-13 10:00:17 +01:00
Ilija Tovilo 3175f24d6a Fix RC1 assumption for typed properties with __get 
Unsetting typed properties resorts back to __get which may have RC1.

Closes GH-10833
 2023-03-13 09:58:49 +01:00
Niels Dossche 6a44705f4e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10611: fpm_env_init_main leaks environ
 2023-03-11 16:35:11 +01:00
Niels Dossche 71c63723c8 Fix GH-10611: fpm_env_init_main leaks environ 
Closes GH-10618.
 2023-03-11 16:34:41 +01:00
Niels Dossche c4508422eb Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10801: Named arguments in CTE functions cause a segfault
 2023-03-10 19:27:17 +01:00
Niels Dossche 2c53d63197 Fix GH-10801: Named arguments in CTE functions cause a segfault 
Fixes GH-10801

Named arguments are not supported by the constant evaluation routine, in
the sense that they are ignored. This causes two issues:
  - It causes a crash because not all oplines belonging to the call are
    removed, which results in SEND_VA{L,R} which should've been removed.
  - It causes semantic issues (demonstrated in the test case).

This case never worked anyway, leading to crashes or incorrect behaviour,
so just prevent CTE of calls with named parameters for now.
We can choose to support it later, but introducing support for this in
a stable branch seems too dangerous.

This patch does not change the removal of SEND_* opcodes in remove_call
because the crash bug can't be triggered anymore with this patch as
there are no named parameters anymore and no variadic CTE functions
exist.

Closes GH-10811.
 2023-03-10 19:22:44 +01:00
Ilija Tovilo cc902530f2 [skip ci] Mark failing date test as xfail 2023-03-10 17:33:56 +01:00
Derick Rethans dfb8cffc59 Merge remote-tracking branch 'derickr/gh10747' into PHP-8.2 2023-03-10 14:43:44 +00:00
Derick Rethans a225581833 Fix GH-10747: Private and protected properties in serialized Date* objects throw 2023-03-10 14:39:22 +00:00
George Peter Banyard 4808fb6932 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10519: Array Data Address Reference Issue
 2023-03-10 14:24:38 +00:00
NathanFreeman 49b2ff5dbb Fix GH-10519: Array Data Address Reference Issue 
We need to carry around a reference to the underlying Bucket to be able to modify it by reference.

Closes GH-10749

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-03-10 14:23:30 +00:00
Kamil Tekiela e223bf2015 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix strlen error message param name
 2023-03-10 12:48:46 +00:00
Kamil Tekiela ad705afc2f Merge branch 'Fix-strlen-error-message-param-name' into PHP-8.1 
* Fix-strlen-error-message-param-name:
  Fix strlen error message param name
 2023-03-10 12:47:40 +00:00
Ilija Tovilo d3c9585204 [skip ci] Fix diff cmd env name in run-tests.php 2023-03-10 01:10:25 +01:00
Ilija Tovilo f415ba60ab Disable asan instrumentation for phpdbg_watchpoint_userfaultfd_thread 
On gcc. It reports a false positive stack-overflow.

Closes GH-10818
 2023-03-10 00:13:27 +01:00
Ilija Tovilo 9030a0c769 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Test Windows with opcache on GitHub actions
 2023-03-09 19:21:33 +01:00
Ilija Tovilo 6b884737c4 Test Windows with opcache on GitHub actions 
Fixes GH-10777
 2023-03-09 19:20:02 +01:00
Derick Rethans a45bef0ac6 Merge branch 'PHP-8.1' into PHP-8.2 2023-03-09 13:37:19 +00:00
Derick Rethans 2922d678aa Merge branch 'fix-variadics-macro' into PHP-8.1 2023-03-09 13:34:01 +00:00
Derick Rethans aead0c8059 Fixed strict zpp arginfo test 2023-03-09 12:20:56 +00:00
Derick Rethans f8891f2861 Fixed strict zpp arginfo test 2023-03-09 11:40:47 +00:00
Derick Rethans 8a9b80cfe0 Add test case 2023-03-09 11:40:45 +00:00
Derick Rethans 717335ec63 Fixed macro generation for variadics, which don't have a default value 2023-03-09 11:39:22 +00:00
Ilija Tovilo 1616ae2fb6 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Update libmysql 5.7 version
 2023-03-08 22:18:16 +01:00
Ilija Tovilo 12290b796b Update libmysql 5.7 version 2023-03-08 22:17:48 +01:00
Michael Voříšek 411cd04541 Re-add some CTE functions that were removed from being CTE by a mistake 
These functions were accidentally removed from being CTE in GH-7780.
This patch brings them back.

Closes GH-10768.
 2023-03-07 20:30:11 +01:00