mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
131,041 Commits 500 Branches 1,381 Tags 797 MiB
ad666eb6df
Commit Graph

131041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Panteleev
ad666eb6df
[ci skip] Update NEWS for c3ccc36 
Fix in Streams moved from 8.2.10 to 8.2.9
 2023-07-19 13:35:18 +03:00
Ilija Tovilo
c3ccc363c6
Fix use-after-free when unregistering user stream wrapper from itself 
Fixes GH-11735
Closes GH-11737
 2023-07-19 11:17:57 +02:00
Ben Ramsey
ad01b6e8c4
Merge branch 'PHP-8.1' into PHP-8.2 2023-07-18 16:39:18 -05:00
Ben Ramsey
6e3c520f51
PHP-8.1 is now for PHP-8.1.23-dev 2023-07-18 16:30:49 -05:00
Ilija Tovilo
e8c9c73118
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix hash_pbkdf2 options parameter
 2023-07-18 19:23:10 +02:00
Ilija Tovilo
7cae6eb8db
Fix hash_pbkdf2 options parameter 
The value needs to be initialized to NULL as it is optional. Furthermore, the
parameter was completely missing in the stub signature.

Closes GH-11731
 2023-07-18 19:21:13 +02:00
Sergey Panteleev
796a75f967
PHP-8.2 is now for PHP 8.2.10-dev 2023-07-18 14:02:43 +03:00
Niels Dossche
8b1d352ed8 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Prevent potential deadlock if accelerated globals cannot be allocated
 2023-07-17 13:00:00 +02:00
Niels Dossche
b0bc057e86 Prevent potential deadlock if accelerated globals cannot be allocated 
Not sure if this is possible to hit in practice, zend_accel_error_noreturn
doesn't return so the unlock isn't called. Other callsites that use both
zend_accel_error_noreturn and zend_shared_alloc_unlock first perform the
unlocking.

Closes GH-11718.
 2023-07-17 12:49:15 +02:00
George Peter Banyard
5f716bf2df
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled
 2023-07-17 07:09:34 +01:00
SakiTakamachi
e0aadc1c0d
Fix GH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled 
This also includes a fix for the MySQL ND driver to actually respect the user decided behaviour.

Closes GH-11622

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-07-17 07:08:45 +01:00
Niels Dossche
f2ed2b877d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Handle fragments consisting out of multiple children without a single root correctly
 2023-07-13 16:12:35 +02:00
Niels Dossche
5c26258eeb Handle fragments consisting out of multiple children without a single root correctly 
Closes GH-11698.
 2023-07-13 16:09:04 +02:00
David CARLIER
0309800b4d Merge branch 'PHP-8.1' into PHP-8.2 2023-07-13 12:40:47 +01:00
David Carlier
69b4360e88 zend_gdb disable gdb detection for FreeBSD < 11. 
ref PR: https://github.com/php/php-src/pull/11599.

Close GH-11646
 2023-07-13 12:39:58 +01:00
George Peter Banyard
1e41b0f1a5
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ext/intl: Fix memory leak in MessageFormatter::format()
 2023-07-12 15:44:41 +01:00
George Peter Banyard
536dbd74fa
ext/intl: Fix memory leak in MessageFormatter::format() 
Closes GH-11658
 2023-07-12 15:43:45 +01:00
Ilija Tovilo
6d98c085a1
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Always memoize assert
 2023-07-12 16:36:08 +02:00
Ilija Tovilo
b1b7c61a27
Always memoize assert 
Closes GH-11686
 2023-07-12 16:35:09 +02:00
Ilija Tovilo
57229836d4
Fix bug-gh11600.phpt 2023-07-12 14:54:56 +02:00
Ilija Tovilo
892704267c
[skip ci] Mark bug-gh11600 as xfail 2023-07-12 14:08:28 +02:00
Ilija Tovilo
060df83a98
Fix double-compilation of arrow-function 
We transform the arrow function by nesting the expression into a return
statement. If we compile the arrow function twice this would be done twice,
leading to a compile assertion.

Fix oss-fuzz #60411
Closes GH-11632
 2023-07-12 11:01:23 +02:00
Niels Dossche
9c47f33a5f Fix bug-gh11600.phpt to work with different ICU versions 2023-07-12 10:35:59 +02:00
Niels Dossche
3552a1be97 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Add regression test for GH-11682
 2023-07-11 23:07:17 +02:00
Niels Dossche
48b246e038 Add regression test for GH-11682 
This bug was already fixed via 15ff830, but we really need more
test coverage.

Co-authored-by: Arne Blankerts <arne@blankerts.de>
 2023-07-11 23:02:01 +02:00
Niels Dossche
832a3d193f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10914: OPCache with Enum and Callback functions results in segmentation fault
 2023-07-11 17:40:21 +02:00
Niels Dossche
bc42179133 Fix GH-10914: OPCache with Enum and Callback functions results in segmentation fault 
See linked issue for analysis.

Closes GH-11675.
 2023-07-11 17:38:09 +02:00
Derick Rethans
a4bdaeabf6 Fix bug GH-11600: Can't parse time strings which include (narrow) non-breaking space characters 2023-07-11 16:29:04 +01:00
Derick Rethans
b8fe445468 Merge branch 'timelib-2022-08-update' into PHP-8.2 2023-07-11 16:27:40 +01:00
Derick Rethans
c02ac26685 Import timelib 2022.08 2023-07-11 16:27:15 +01:00
Niels Dossche
47b7570f07 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix tests for stat rdev
 2023-07-11 13:57:28 +02:00
Niels Dossche
6b87e08b82 Fix tests for stat rdev 
If HAVE_STRUCT_STAT_ST_RDEV is not set, rdev will be -1. %d only matches
a natural number, we should let it match negative numbers too.
 2023-07-11 13:57:17 +02:00
Ben Ramsey
097b08cbbe
Merge branch 'PHP-8.1' into PHP-8.2 2023-07-10 09:26:17 -05:00
Peter Kokot
41a3573fcc
Fix GH-9483: Autoconf warnings for newer Autoconf versions 
Co-authored-by: Levi Morrison <morrison.levi@gmail.com>
 2023-07-10 09:25:58 -05:00
Niels Dossche
2957be202e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
 2023-07-10 16:02:31 +02:00
Niels Dossche
3d9c557041 [ci skip] NEWS 2023-07-10 16:01:52 +02:00
Niels Dossche
57ff1c354e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11630: proc_nice_basic.phpt only works at certain nice levels
  Fix GH-11629: bug77020.phpt tries to send mail
  Fix GH-11625: DOMElement::replaceWith() doesn't replace node with DOMDocumentFragment but just deletes node or causes wrapping <></> depending on libxml2 version
 2023-07-10 13:34:21 +02:00
Niels Dossche
c408a8b604 Fix GH-11630: proc_nice_basic.phpt only works at certain nice levels 
Closes GH-11635.
 2023-07-10 13:30:00 +02:00
Niels Dossche
06d87e4c14 Fix GH-11629: bug77020.phpt tries to send mail 
Closes GH-11636.
 2023-07-10 13:29:49 +02:00
Niels Dossche
15ff830373 Fix GH-11625: DOMElement::replaceWith() doesn't replace node with DOMDocumentFragment but just deletes node or causes wrapping <></> depending on libxml2 version 
Depending on the libxml2 version, the behaviour is either to not
render the fragment correctly, or to wrap it inside <></>. Fix it by
unpacking fragments manually. This has the side effect that we need to
move the unlinking check in the replacement function to earlier because
the empty child list is now possible in non-error cases.
Also fixes a mistake in the linked list management.

Closes GH-11627.
 2023-07-10 13:29:31 +02:00
Niels Dossche
3ee2ade917 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Add missing check on EVP_VerifyUpdate() in phar util
 2023-07-09 22:55:01 +02:00
Niels Dossche
0d07b6d647 Add missing check on EVP_VerifyUpdate() in phar util 
Closes GH-11640.
 2023-07-09 22:54:27 +02:00
Niels Dossche
e25e14ad95 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix return value of _php_server_push_callback in case of failure
 2023-07-09 01:09:50 +02:00
Niels Dossche
dc9adda653 Fix return value of _php_server_push_callback in case of failure 
It should return CURL_PUSH_DENY by default instead of CURL_PUSH_OK in
the branch I added, just like the check above.
I forgot to change this after doing tests.
 2023-07-09 01:08:34 +02:00
Niels Dossche
d0c824cb7e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION
 2023-07-08 21:39:17 +02:00
Niels Dossche
3ccd8d7866 Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION 
Previously this caused a SIGABRT.

Closes GH-11639.
 2023-07-08 21:32:10 +02:00
Niels Dossche
6719bf7de5 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
 2023-07-07 19:27:34 +02:00
Niels Dossche
bbe72f160d [ci skip] NEWS 
The alphabet is hard...
 2023-07-07 19:26:58 +02:00
Niels Dossche
4a28cc725a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-9669: phpdbg -h options doesn't list the -z option
 2023-07-07 19:17:35 +02:00
Adam Saponara
119b062169 Fix GH-9669: phpdbg -h options doesn't list the -z option 
Adds `-z` flag in phpdbg output.

Closes GH-9713.
 2023-07-07 19:16:32 +02:00