php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
132,039 Commits 547 Branches 1,483 Tags
f0122664fe49de43e71cc08787e7b66a4d304c21
Commit Graph

63997 Commits

Author SHA1 Message Date
Dmitry Stogov
f0122664fe Merge branch 'PHP-8.2' 
* PHP-8.2:
  JIT: Fixed inaccurate range inference usage for UNDEF/NULL/FALSE
 2023-05-02 12:04:11 +03:00
Dmitry Stogov
7e50735140 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  JIT: Fixed inaccurate range inference usage for UNDEF/NULL/FALSE
 2023-05-02 12:04:03 +03:00
Dmitry Stogov
25ad171f63 JIT: Fixed inaccurate range inference usage for UNDEF/NULL/FALSE 
Fixes oss-fuzz #58459
 2023-05-02 12:02:20 +03:00
Tim Düsterhus
bf727cf5e2 RFC: Make unserialize() emit a warning for trailing bytes (#9630) 2023-05-01 19:06:40 +02:00
Ilija Tovilo
626331fd5a Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Fix tmp file clash in ext/zip/tests/oo_cancel.phpt
 2023-05-01 15:29:51 +02:00
Ilija Tovilo
574d780a2f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Fix tmp file clash in ext/zip/tests/oo_cancel.phpt
 2023-05-01 15:29:45 +02:00
Ilija Tovilo
8fc023cbae [skip ci] Fix tmp file clash in ext/zip/tests/oo_cancel.phpt 2023-05-01 15:28:59 +02:00
Niels Dossche
b915a1d8d7 Fix uninitialised variable warning in mbfilter_sjis.c 
Compiling in release mode with UBSAN gives me the following compiler warning:
```
In function ‘mb_wchar_to_sjismac’:
mbfilter_sjis.c:1419:89: warning: ‘i’ may be used uninitialized [-Wmaybe-uninitialized]
 1419 | buf->state = (i << 24) | (index << 16) | (w & 0xFFFF);
      |                 ^~
mbfilter_sjis.c:1398:42: note: ‘i’ was declared here
 1398 | for (int i = 0; i < code_tbl_m_len; i++) {
      |          ^
```

Since the if condition will always be taken after the goto, we can get
rid of the warning by moving the label inside the if.

Signed-off-by: Alex Dowad <alexinbeijing@gmail.com>
 2023-04-30 13:51:52 +02:00
Ilija Tovilo
44724430c1 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Propagate STREAM_DISABLE_OPEN_BASEDIR src flag to php_stream_stat_path_ex
 2023-04-30 13:37:14 +02:00
Ilija Tovilo
de9b3f648c Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Propagate STREAM_DISABLE_OPEN_BASEDIR src flag to php_stream_stat_path_ex
 2023-04-30 13:37:08 +02:00
Ilija Tovilo
8bf2d587d7 Propagate STREAM_DISABLE_OPEN_BASEDIR src flag to php_stream_stat_path_ex 
Otherwise we can get open_basedir warnings from the stat call while still
performing the actual copy.

Fixes GH-11138
Closes GH-11156
 2023-04-30 13:36:15 +02:00
David CARLIER
6a9061e0af Fix GH-9344: pgsql pipeline mode proposal. 
Adding pg_enter_pipeline_mode, pg_exit_pipeline_mode,
pg_pipeline_sync and pg_pipeline_status.

Close GH-10868
 2023-04-28 20:53:11 +01:00
Javier Eguiluz
732d92c0e5 [skip ci] Fix various typos and grammar issues (#11143) 2023-04-28 11:05:32 +02:00
Máté Kocsis
945db3cd61 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix ZPP of pg_lo_export()
 2023-04-27 18:53:49 +02:00
Máté Kocsis
a2d90aaef2 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix ZPP of pg_lo_export()
 2023-04-27 18:51:19 +02:00
Máté Kocsis
f0149c5c0b Fix ZPP of pg_lo_export() 
Closes GH-11132
 2023-04-27 18:50:09 +02:00
David Carlier
7b4b40f06f ext/sockets: addig Linux's IP_BIND_ADDRESS_NO_PORT. 
Delay ephemeral port number attribution at connect time rather
than at bind's one.

Close GH-11119.
 2023-04-26 19:26:29 +01:00
Michael Voříšek
f89fe830f2 Minor conditions simplify (#10397) 2023-04-26 15:12:01 +02:00
nielsdos
56f916e703 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Set error_log to an empty value if the test relies on that feature
 2023-04-24 23:25:27 +02:00
nielsdos
7300659391 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Set error_log to an empty value if the test relies on that feature
 2023-04-24 23:23:45 +02:00
Niels Dossche
691ff9f845 Set error_log to an empty value if the test relies on that feature 
Some tests fail if the error_log is overriden by the loaded ini
configuration. Explicitly set it to an empty value to prevent the
failures.
See https://github.com/php/php-src/issues/10737#issuecomment-1452899299

Closes GH-10772.
 2023-04-24 23:19:15 +02:00
Niels Dossche
947eb95241 Allow array functions to operate in-place if the refcount is 1 (#11060) 
This allows array_merge, array_intersect, array_replace, array_unique
and usort to avoid taking a copy and do the transformation in-place.

** Safety **

There are some array functions which take a copy of the input
array into a temporary C array for sorting purposes.
(e.g. array_unique, array_diff, and array_intersect do this).
Since we no longer take a copy in all cases, we must check if
it's possible that a value is accessed that was already destroyed.

For array_unique: cmpdata will never be removed so that will never reach
refcount 0. And when something is removed, it is the previous value of
cmpdata, not the one user later. So this seems okay.

For array_intersect: a previous pointer (ptr[0] - 1) is accessed.
But this can't be a destroyed value because the pointer is first moved forward.

For array_diff: it's possible a previous pointer is accessed after
destruction. So we can't optimise this case easily.
 2023-04-24 23:18:05 +02:00
Michael Voříšek
1209f593ca Allow CTE on basic type/math functions (#10842) 2023-04-24 22:39:20 +02:00
David CARLIER
976d7ed4c6 ext/intl: deprecate U_MULTIPLE_DECIMAL_SEPERATORS constant 
Close GH-10980
 2023-04-23 10:37:55 +01:00
Derick Rethans
4ce00aa894 Merge branch 'PHP-8.2' 2023-04-21 11:30:03 +01:00
Derick Rethans
629d7740e8 Import timelib 2022.07 to address OSS fuzz issue 2023-04-21 11:29:56 +01:00
Ilija Tovilo
6f63d4b274 Fix -Wenum-int-mismatch warnings on gcc 13 
Closes GH-11103
 2023-04-20 16:04:59 +02:00
Ilija Tovilo
04fd04acab Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix reference returned from CallbackFilterIterator::accept()
 2023-04-20 13:43:29 +02:00
Ilija Tovilo
b2282bee32 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix reference returned from CallbackFilterIterator::accept()
 2023-04-20 13:43:20 +02:00
Ilija Tovilo
5855bdcd6c Fix reference returned from CallbackFilterIterator::accept() 
Fixes oss-fuzz #58181
 2023-04-20 10:18:18 +02:00
Christopher Jones
b06a6b82d6 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Bump OCI8 version to make a PECL release for 8.2
 2023-04-20 18:04:46 +10:00
Christopher Jones
91d3aaaa93 Bump OCI8 version to make a PECL release for 8.2 2023-04-20 18:01:43 +10:00
Ilija Tovilo
4af95b7c58 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix mysql tests with non-standard server port
 2023-04-20 08:46:01 +02:00
Ilija Tovilo
72fc8b51a4 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix mysql tests with non-standard server port
 2023-04-20 08:45:52 +02:00
Michael Voříšek
0ab51a9561 Fix mysql tests with non-standard server port 
Closes GH-9744
 2023-04-20 08:45:14 +02:00
Ilija Tovilo
b22758d764 Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:23 +02:00
Ilija Tovilo
f948f79696 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:16 +02:00
Ilija Tovilo
af6b413691 [skip ci] Add all conflict to curl 2023-04-19 16:23:52 +02:00
Derick Rethans
360e6f842c Merge branch 'PHP-8.2' 2023-04-18 13:48:34 +01:00
Derick Rethans
cc7b799c44 Fixed tests 2023-04-18 13:46:07 +01:00
Derick Rethans
44eef677b0 Import timelib 2022.06 2023-04-18 13:46:07 +01:00
Remi Collet
c75facb566 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-11071: Revert "Fix [-Wundef] warning in INTL extension"
 2023-04-18 11:05:23 +02:00
Remi Collet
f5dc2c31d9 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11071: Revert "Fix [-Wundef] warning in INTL extension"
 2023-04-18 11:04:54 +02:00
Remi Collet
31e21f7dbc Fix GH-11071: Revert "Fix [-Wundef] warning in INTL extension" 
This reverts commit ea8686540a.
 2023-04-18 11:04:28 +02:00
Jakub Holubansky
5a4083181b ext/openssl: pass ini options to extra processes in tests 2023-04-17 12:25:35 +01:00
Máté Kocsis
414f71a902 Typed class constants (#10444) 
RFC: https://wiki.php.net/rfc/typed_class_constants

Co-Authored-By: Ben <7127204+moliata@users.noreply.github.com>
Co-Authored-By: Bob Weinand <3154871+bwoebi@users.noreply.github.com>
Co-Authored-By: Ilija Tovilo <ilija.tovilo@me.com>
 2023-04-16 22:20:26 +02:00
Ilija Tovilo
4dad419ae6 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Support enums in array_unique
 2023-04-16 15:36:02 +02:00
Ilija Tovilo
35c1bb2e47 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Support enums in array_unique
 2023-04-16 15:35:55 +02:00
Ilija Tovilo
e8b8341d3d Support enums in array_unique 
Fixes GH-9775
Closes GH-11015
 2023-04-16 15:34:56 +02:00
Jakub Zelenka
6d33a1ab70 Merge branch 'PHP-8.1' into PHP-8.2 2023-04-16 10:55:02 +01:00