php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-08 00:22:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
131,613 Commits 547 Branches 1,482 Tags
bb97ae7c24ade60bc993d39463dabcee78b5c577
Commit Graph

131613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
bb97ae7c24 Merge branch 'PHP-8.2' 
* PHP-8.2:
  avoid test file being consider binary
 2023-03-14 15:54:53 +01:00
Remi Collet
f575027b56 avoid test file being consider binary 2023-03-14 15:54:38 +01:00
David Carlier
974a3d8441 ext/mysqli/pgsql: mysqli_fetch_object/pgsql_fetch_object raises ValueError on constructor args error. 
Closes GH-10832.
 2023-03-13 19:54:49 +00:00
Niels Dossche
f9375dc723 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix module shutdown crash during ZTS JIT shutdown
 2023-03-13 20:12:37 +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
a00e4a3649 Merge branch 'PHP-8.2' 2023-03-13 12:39:40 +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
897b13a217 Fixed new OSS-FUZZ test 2023-03-13 11:26:22 +00:00
Derick Rethans
e20e06b759 Merge branch 'PHP-8.2' 2023-03-13 11:25:41 +00:00
Derick Rethans
2d3aa8a5c4 Fixed test for GH-10147 2023-03-13 11:23:40 +00:00
Derick Rethans
b96a382419 Merge branch 'PHP-8.2' 2023-03-13 11:04:01 +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
96a3825849 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix RC1 assumption for typed properties with __get
 2023-03-13 10:00:28 +01: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
e2ec59f0c4 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10611: fpm_env_init_main leaks environ
 2023-03-11 16:39:23 +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
5c058d7b15 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10801: Named arguments in CTE functions cause a segfault
 2023-03-10 19:31:19 +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
779ab32d4f Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Mark failing date test as xfail
 2023-03-10 17:34:17 +01:00
Ilija Tovilo
cc902530f2 [skip ci] Mark failing date test as xfail 2023-03-10 17:33:56 +01:00
Ilija Tovilo
47f80ffc77 Remove unnecessary type punnign from mysqli_api.c 
value is a long. On big-endian architectures mysql_stmt_attr_get() will write to
the most significant byte. Type punning was used to move that byte to the least
significant one, which is UB. We can avoid this by simply casting to my_bool
(alias of bool). Previously, a comparison against 0 should've been done.
 2023-03-10 17:15:46 +01:00
Ilija Tovilo
f60dc47f36 Re-enable -Wstrict-aliasing 
We're not disabling -fstrict-aliasing to it's better to keep this warning.

Closes GH-10821
 2023-03-10 17:15:46 +01:00
Kévin Dunglas
f0495855a3 feat: enable Zend Max Execution Timers by default in 8.3 (#10778) 2023-03-10 16:22:42 +01:00
Derick Rethans
afd42610c0 Merge branch 'PHP-8.2' 2023-03-10 14:43:51 +00: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
1d9d1fe109 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10519: Array Data Address Reference Issue
 2023-03-10 14:24:54 +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
Ilija Tovilo
6f1e5ff8c3 Fix GC_BENCH flag (#10823) 
zend_gc_globals is now hidden, so we can't access it from zend.c.
 2023-03-10 15:02:22 +01:00
Kamil Tekiela
69ec3c6bc6 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix strlen error message param name

Closes GH-10784
 2023-03-10 12:52:28 +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
d9edda0822 [skip ci] Keep old branches on Ubuntu 20.04 on nightly 2023-03-10 11:51:12 +01:00
Ilija Tovilo
0760a57205 [skip ci] Remove references to Azure Pipelines 2023-03-10 01:32:28 +01:00
Ilija Tovilo
c0ee8e833c Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Fix diff cmd env name in run-tests.php
 2023-03-10 01:10:55 +01: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
d98963a071 Switch to Ubuntu 22.04 for GitHub actions jobs 
Closes GH-10814
 2023-03-10 00:17:23 +01:00
Ilija Tovilo
08e7366d0a Merge branch 'PHP-8.2' 
* PHP-8.2:
  Disable asan instrumentation for phpdbg_watchpoint_userfaultfd_thread
 2023-03-10 00:14:09 +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
David Carlier
45677081fa ext/intl: dateformatter settimezone changes on success, returning true like setcalendar. 
Closes GH-10790
 2023-03-09 21:45:26 +00:00
Ilija Tovilo
9982e42fee Merge branch 'PHP-8.2' 
* PHP-8.2:
  Test Windows with opcache on GitHub actions
 2023-03-09 19:21:42 +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