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
126,619 Commits 549 Branches 1,485 Tags
906cb52c63a72e6a893e603f4e07cde617786db9
Commit Graph

60749 Commits

Author SHA1 Message Date
Dmitry Stogov 906cb52c63 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed NAN handling in SCCP
 2022-01-10 19:40:22 +03:00
Dmitry Stogov 698ac23711 Fixed NAN handling in SCCP 
Fixes oss-fuzz #43341
 2022-01-10 19:39:19 +03:00
Dmitry Stogov c958ab121b JIT: Fix array separation after capturing by user error handler 
Fixes oss-fuzz #43288
 2022-01-10 17:27:00 +03:00
Dmitry Stogov 8a5c68181c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Added test
 2022-01-10 16:05:56 +03:00
Dmitry Stogov 71d6501346 Added test 2022-01-10 16:05:40 +03:00
Dmitry Stogov b80d30d821 Fix type inference for assign to string offset with invalid index. 
Fixes oss-fuzz #43277
 2022-01-10 16:03:54 +03:00
Dmitry Stogov 56430ef667 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fix incorrect FETCH_THIS elimination
 2022-01-10 15:40:06 +03:00
Dmitry Stogov 4170d41a66 JIT: Fix incorrect FETCH_THIS elimination 
Fizex oss-fuzz #43159
 2022-01-10 15:37:36 +03:00
David Carlier be22018f35 Fix pcntl_rfork build for DragonFlyBSD 
RFTSIGZMB flag unsupported, guarding with the said flag instead of system
in case the implementaion catches up with FreeBSD's.

Closes GH-7918.
 2022-01-10 13:10:30 +01:00
Christoph M. Becker 4833362844 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #81430: Attribute instantiation leaves dangling pointer
 2022-01-10 12:42:18 +01:00
Benjamin Eberlei 2f6a06ccb0 Fix #81430: Attribute instantiation leaves dangling pointer 
By switching attribute constructor stackframe to be called via
trampoline the stack allocation is not causing dangling pointers
in the zend_observer API anymore.

Co-Authored-By: Florian Sowade <f.sowade@suora.com>
Co-Authored-By: Christopher Becker <cmbecker69@gmx.de>
Co-Authored-By: Dmitry Stogov <dmitry@zend.com>

Closes GH-7885.
 2022-01-10 12:40:15 +01:00
Christoph M. Becker 0a9f552911 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ODBC test which may not properly clean up
 2022-01-07 19:25:23 +01:00
Christoph M. Becker 9781085782 Fix ODBC test which may not properly clean up 
If these tests fail with a fatal error, they won't properly clean up,
which likely causes other tests to fail as (several ODBC tests use the
`odbcTEST` database and tables or stored procedures named `FOO`).  This
is particularly annoying during development, where you would need to
clean up manually.

We fix this by moving the cleanup code to the --CLEAN-- section, so
that this code is executed no matter what.

Closes GH-7886.
 2022-01-07 19:23:57 +01:00
Máté Kocsis 62e4ac9439 Add support for custom property links 
Closes GH-7892
 2022-01-07 08:28:26 +01:00
Christoph M. Becker 623b21220b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ext/sockets build on Haiku
 2022-01-04 14:12:56 +01:00
David Carlier 09165ace37 Fix ext/sockets build on Haiku 
The `SOCK_RDM` datagram option is unsupported on Haiku; instead `ifreq`
has direct access to `ifr_index`.

Closes GH-7849.
 2022-01-04 14:10:50 +01:00
Máté Kocsis f70ca0acd4 Mark mysqli_driver properties readonly 2022-01-04 08:41:02 +01:00
Máté Kocsis 96a5026bfd Redefine PDOException::$code with correct type 
Closes GH-7839
 2022-01-01 17:54:59 +01:00
Christoph M. Becker d963b3f015 mysqli_next_result_no_repeat_error.phpt must not use --EXTENSIONS-- 
This is only properly supported as of PHP 8.1.0[1], and may cause
spurious test failures for older versions[2].

[1] <https://github.com/php/php-src/pull/6787>
[2] <https://ci.appveyor.com/project/php/php-src/builds/42044075/job/tk4138s43p1953hx>
 2021-12-31 00:24:56 +01:00
Kamil Tekiela b51f51952a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix formatting in the new mysqli test
 2021-12-30 19:28:35 +00:00
Kamil Tekiela 49512b6b36 Fix formatting in the new mysqli test 2021-12-30 19:25:32 +00:00
Christoph M. Becker ae9e98640a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix bug where large bigints may be truncated
 2021-12-30 19:10:36 +01:00
NathanFreeman b3903515bf Fix bug where large bigints may be truncated 
Unless stringified results are requested, we need to parse large
bigints as unsigned, to avoid wrap-around behavior.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-7837.
 2021-12-30 19:07:36 +01:00
Kamil Tekiela 8869bbe0e9 Fix bug GH-7746 (mysqli_sql_exception->sqlstate is inaccessible) 
Closes GH-7747
 2021-12-30 14:23:06 +00:00
Máté Kocsis 24be11f632 Remove bogus type of $object param in SplObjectStorage::offsetSet() 
This parameter definitely only accepts objects, so we shouldn't explicitly
mark it as mixed. Looks like I accidentally added this type when adding
the tentative return type.

Closes GH-7840
 2021-12-28 18:01:26 +01:00
Dmitry Stogov c69b9426ff Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  iSeparate tests
  JIT: Fix array clobbering by user error handler
 2021-12-28 17:00:40 +03:00
Dmitry Stogov 206bcff50d iSeparate tests 2021-12-28 16:56:23 +03:00
Dmitry Stogov fd879e6fe4 JIT: Fix array clobbering by user error handler 
Gixes oss-fuzz #43055
 2021-12-28 16:51:03 +03:00
Dmitry Stogov 8862e23098 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix reference contig inference
 2021-12-28 10:00:14 +03:00
Dmitry Stogov de358f856f Fix reference contig inference 
Fixes oss-fuzz #43032
 2021-12-28 09:57:03 +03:00
Christoph M. Becker d58c48d45d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers"
 2021-12-27 21:10:40 +01:00
Christoph M. Becker ee610947ce Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers" 
This reverts commit 76e2a8380e.  Cf.
<https://github.com/php/php-src/commit/76e2a8380e5e030412e9d565955d011972af8418#r62560239>.
 2021-12-27 21:08:51 +01:00
Christoph M. Becker d4c07df4df Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix zend_observer_fcall_end_all() accessing dangling pointers
 2021-12-27 18:20:48 +01:00
Florian Sowade 76e2a8380e Fix zend_observer_fcall_end_all() accessing dangling pointers 
This may happen, when the execute_data was allocated on the stack.  We
ensure that the runtime cache pointer is not NULL before dereferencing
it.

This is a partial fix for bug 81430.

Closes GH-7665.
 2021-12-27 18:19:13 +01:00
David Warner f82593d597 Fix GH-7815: php_uname doesn't recognise latest Windows versions 
We check `dwBuildNumber` to determine newer Windows versions.

Closes GH-7816.
 2021-12-27 15:08:11 +01:00
Christoph M. Becker 7f0a1e2f2d Fix bug40228*.phpt conflict 
Both tests use the same directory structure; we avoid that by
extracting to separate subdirectories.

Closes GH-7831.
 2021-12-26 23:23:56 +01:00
Christoph M. Becker 710dc03399 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Mark curl tests using http2.golang.org as XFAIL
 2021-12-26 22:29:17 +01:00
Christoph M. Becker 5005445994 Mark curl tests using http2.golang.org as XFAIL 
http2.golang.org/serverpush has been retired[1], so we need to come up
with an alternative.  Until then, we mark the relevant tests as XFAIL
(although bug77535.phpt passes, what might be an indication that the
test needs further revision).  To avoid waiting for the timeout, we
also unconditionally skip these tests for now.

[1] <https://github.com/golang/go/issues/49301>

Closes GH-7829.
 2021-12-26 22:27:15 +01:00
Christoph M. Becker 0cd1741004 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Prevent strict interpretation of tentative definition
 2021-12-26 16:42:33 +01:00
Christoph M. Becker e76ddbd2f6 Prevent strict interpretation of tentative definition 
This header declaration is never supposed to be interpreted as
definition; otherwise, the handlers are not properly initialized, what
happens, for instance, with ASan instrumented MSVC builds.

Closes GH-7827.
 2021-12-26 16:41:25 +01:00
Christoph M. Becker a6ddd1a14d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-7826: Inconsistent argument name in hash_hmac_file and hash_file
 2021-12-26 12:59:06 +01:00
Christoph M. Becker fd3fc5c193 Fix GH-7826: Inconsistent argument name in hash_hmac_file and hash_file 
Like `hash_file()`, `hash_hmac_file()` expects a filename, and not some
string data.  Fixing this now, constitutes a (hopefully small) BC break
though.

Closes GH-7828.
 2021-12-26 12:55:53 +01:00
Christoph M. Becker 9e4437f8c6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix chunk_split_variation*_32bit.phpt for Windows
 2021-12-26 12:07:07 +01:00
Christoph M. Becker b4ba65dd9d Fix chunk_split_variation*_32bit.phpt for Windows 
Both tests fail on Windows for slightly different reasons, what appears
to be legit, and as such we fix the test expectations.

Closes GH-7830.
 2021-12-26 12:05:52 +01:00
Dmitry Stogov b2939b636d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak in SCCP
 2021-12-24 13:10:58 +03:00
Dmitry Stogov 2b81156f2a Fix memory leak in SCCP 
Fixes oss-fuzz #42878
 2021-12-24 13:10:22 +03:00
Christoph M. Becker 0ed39ed809 Fix GH-7809: Cloning a faked SplFileInfo object may segfault 
While the `path` is not supposed to be `NULL` for normal operation, it
is possible to create `SplFileInfo` objects where that is the case, and
we must not follow the null pointer.

Closes GH-7814.
 2021-12-23 23:10:51 +01:00
Christoph M. Becker 9d2dc1e9a9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Avoid void* arithmetic in sockets/multicast.c on NetBSD
 2021-12-23 16:21:28 +01:00
David Carlier 3f0bb67361 Avoid void* arithmetic in sockets/multicast.c on NetBSD 
On NetBSD, ifconf.ifc_buf member, unlike most of platforms, is a void
pointer.

We also fix the cpuinfo declarations with empty parameter lists.

Closes GH-7819.
 2021-12-23 16:17:30 +01:00
Christoph M. Becker d37c496735 [ci skip] Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  [ci skip] Update the min curl version in the sync-constants.php script
 2021-12-23 13:44:23 +01:00