clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
127,307 Commits 491 Branches 1,363 Tags 837 MiB
2337c0516a
Commit Graph

127307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
2337c0516a Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix incorrect optimization that leads to memory leak
 2021-12-13 13:25:47 +03:00
Dmitry Stogov
f8f0a650a7 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix incorrect optimization that leads to memory leak
 2021-12-13 13:09:05 +03:00
Dmitry Stogov
230de7721f Fix incorrect optimization that leads to memory leak 
Fixes oss-fuzz #42221
 2021-12-13 13:08:05 +03:00
Dmitry Stogov
3e13f162ce Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix crash during compilation of function with incompletely constructed SSA
 2021-12-13 11:51:50 +03:00
Dmitry Stogov
1f03debb68 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fix crash during compilation of function with incompletely constructed SSA
 2021-12-13 11:51:41 +03:00
Dmitry Stogov
e79dbe1124 JIT: Fix crash during compilation of function with incompletely constructed SSA 
Fixes oss-fuzz #42200
 2021-12-13 11:49:51 +03:00
Christoph M. Becker
1d54097435
Fix oci8 Oracle Client paths on Windows 
This is a copy & paste relict, but we don't fix it for the stable
branches, since some may rely on these paths now (unlikely, but still
possible).
 2021-12-12 22:45:46 +01:00
Christoph M. Becker
900c94fc7c
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-7765: php_oci_cleanup_global_handles segfaults at second call
 2021-12-12 22:39:08 +01:00
Christoph M. Becker
c35be03628
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-7765: php_oci_cleanup_global_handles segfaults at second call
 2021-12-12 22:38:55 +01:00
Christoph M. Becker
c435e67746
Fix GH-7765: php_oci_cleanup_global_handles segfaults at second call 
We must not use the TSRM accessor macros in GINIT and GSHUTDOWN, but
rather use the passed pointers directly.  For simplicity, we inline
`php_oci_cleanup_global_handles()`, and also the `PHP_OCI_CALL()`
macros; the latter are unlikely to be needed here, but don't hurt.

Closes GH-7766.
 2021-12-12 22:38:00 +01:00
Christoph M. Becker
dd6b1b7ef7
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-7757: Multi-inherited final constant causes fatal error
 2021-12-12 22:23:07 +01:00
Christoph M. Becker
206c521a1f
Fix GH-7757: Multi-inherited final constant causes fatal error 
"Diamond" inheritance of final constants is supposed to be supported.

Closes GH-7767.
 2021-12-12 22:22:51 +01:00
Christoph M. Becker
443a420c25
[ci skip] Merge branch 'PHP-8.1' 
* PHP-8.1:
  macOS 10.14 runners are no longer available via Azure Pipeline
 2021-12-12 19:18:06 +01:00
Christoph M. Becker
577358b8d2
[ci skip] Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  macOS 10.14 runners are no longer available via Azure Pipeline
 2021-12-12 19:17:37 +01:00
Christoph M. Becker
9998082a6a
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  macOS 10.14 runners are no longer available via Azure Pipeline
 2021-12-12 19:16:48 +01:00
Christoph M. Becker
6d5f2ba78d
macOS 10.14 runners are no longer available via Azure Pipeline 
These images have already been deprecated for two months[1].  Thus,
we upgrade to macOS 10.15.  Since clang 12 is picky about
`int-in-bool-context` warning, we disable `-Werror`.

[1] <https://devblogs.microsoft.com/devops/hosted-pipelines-image-deprecation/>
 2021-12-12 19:11:21 +01:00
Christoph M. Becker
fe2c13cda4
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-7759: Incorrect return types for hash() and hash_hmac()
 2021-12-12 15:47:39 +01:00
Christoph M. Becker
a708db9c8a
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-7759: Incorrect return types for hash() and hash_hmac()
 2021-12-12 15:47:19 +01:00
Christoph M. Becker
0b3a937670
Fix GH-7759: Incorrect return types for hash() and hash_hmac() 
`hash()` and `hash_hmac()` never return `false`; only `hash_file()` and
`hash_hmac_file()` return `false` in case the data cannot be read.

Closes GH-7760.
 2021-12-12 15:39:55 +01:00
Christoph M. Becker
3acf63245a
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix error message allocation of PDO PgSQL
 2021-12-12 15:18:58 +01:00
Christoph M. Becker
926dee1b6f
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix error message allocation of PDO PgSQL
 2021-12-12 15:18:32 +01:00
SATO Kentaro
778513f605
Fix error message allocation of PDO PgSQL 
Closes GH-7723.
 2021-12-12 15:17:36 +01:00
Christoph M. Becker
973c4d406b
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix openssl_x509_checkpurpose_basic.phpt
 2021-12-12 14:28:49 +01:00
Christoph M. Becker
f19250a3a1
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix openssl_x509_checkpurpose_basic.phpt
 2021-12-12 14:28:16 +01:00
Christoph M. Becker
2c2b0abd4a
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix openssl_x509_checkpurpose_basic.phpt
 2021-12-12 14:27:07 +01:00
Christoph M. Becker
98175fc7f1
Fix openssl_x509_checkpurpose_basic.phpt 
This test fails because san-cert.pem and san-ca.pem have expired.  We
fix that by using the CertificateGenerator to generate temporary certs
during the test run.  Since san-cert.pem and san-ca.pem have been
identical, we only generate one certificate.

Closes GH-7763.
 2021-12-12 14:26:17 +01:00
Christopher Jones
93f6af6913
It's past time to drop linking support for Oracle Client 10g 2021-12-12 13:58:04 +11:00
David CARLIER
e7f3bc9506
Fix pcntl_forkx condition in stub (#7755) 2021-12-11 21:49:31 +01:00
Christopher Jones
701e5fe4ae
Merge branch 'lobpf1' 
* lobpf2:
  Add oci_set_prefetch_lob()
 2021-12-11 22:16:49 +11:00
Christopher Jones
ac91b83ceb
Add oci_set_prefetch_lob() 2021-12-11 21:38:08 +11:00
Christoph M. Becker
6606cc04fe
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-7748: gethostbyaddr outputs binary string
 2021-12-10 17:39:12 +01:00
Christoph M. Becker
7daf01258d
Fix GH-7748: gethostbyaddr outputs binary string 
`getnameinfo(3)` returns zero on success; all other values need to be
regarded as failure.
 2021-12-10 17:38:36 +01:00
Tyson Andre
25bb229f57
Allocate less memory for EG(errors) when recording errors for opcache (#7744) 
errors is an array of pointers, not an array of values.

Low importance since this is freed after opcache compiles a file and there are
typically no or very few errors.
 2021-12-10 09:19:16 -05:00
Dmitry Stogov
bdcef24f4b Merge branch 'PHP-8.1' 
* PHP-8.1:
  Remove range inference for booleans.
 2021-12-10 14:44:21 +03:00
Dmitry Stogov
cfcee97ad6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Remove range inference for booleans.
 2021-12-10 14:33:36 +03:00
Dmitry Stogov
6f42c073cf Remove range inference for booleans. 
Range inference for bolleans and longs comparison was incorrect.

Fizes oss-fuzz #fuzz-42161.php
 2021-12-10 14:32:47 +03:00
Christoph M. Becker
4013ebe431
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix #81585: cached_chunks are not counted to real_size on shutdown
 2021-12-10 12:26:17 +01:00
Christoph M. Becker
2362722dcf
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #81585: cached_chunks are not counted to real_size on shutdown
 2021-12-10 12:25:44 +01:00
Christoph M. Becker
5675ebe649
Fix #81585: cached_chunks are not counted to real_size on shutdown 
The amount of allocated system memory is kept in `real_size`, including
the allocated `cached_chunks`.  Thus, we need to keep the proper count
at the end of the shutdown.

Closes GH-7745.
 2021-12-10 12:24:06 +01:00
Dmitry Stogov
abcf68387d Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix incorrect JMP optimization
 2021-12-10 01:45:03 +03:00
Dmitry Stogov
363434bab2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix incorrect JMP optimization
 2021-12-10 01:44:55 +03:00
Dmitry Stogov
0ac3d78d7d Fix incorrect JMP optimization 
Fixes oss-fuzz #42155
 2021-12-10 01:39:28 +03:00
George Peter Banyard
da684582d7
ZEND_INIT_FCALL is only produced when function exists at compile time (#7728) 2021-12-09 17:15:59 +00:00
Dmitry Stogov
91734fc579 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix crush after compilation of nullsafe operator introduced in 307e476e86
 2021-12-09 18:19:38 +03:00
Dmitry Stogov
7e080183f4 Fix crush after compilation of nullsafe operator introduced in 307e476e86 
Now we flush only delayed opcodes realted to this nullsafe operator.

Fixes oss-fuzz #42152
 2021-12-09 18:15:47 +03:00
Christoph M. Becker
9c6b843ff0
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Skip bug_36798.phpt for PDO_DBLIB
 2021-12-07 20:26:19 +01:00
Christoph M. Becker
7d4fdf1510
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Skip bug_36798.phpt for PDO_DBLIB
 2021-12-07 20:25:35 +01:00
Christoph M. Becker
efb901ebed
Skip bug_36798.phpt for PDO_DBLIB 
For some reason, this test fails now with "Incorrect syntax near ''.
[SELECT '�' as test FROM test WHERE id = '1']", so we skip it.
 2021-12-07 20:24:15 +01:00
Dmitry Stogov
90e5eed9db Merge branch 'PHP-8.1' 
* PHP-8.1:
  Separate "cold" code
 2021-12-07 11:47:01 +03:00
Dmitry Stogov
08f1d470fb Separate "cold" code 2021-12-07 11:46:32 +03:00