php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 02:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
135,600 Commits 547 Branches 1,481 Tags
php-8.3.21
Commit Graph

2244 Commits

Author SHA1 Message Date
Ilija Tovilo
276c2a67ef Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix flaky connection count in mysqli test
 2025-03-13 16:47:20 +01:00
Ilija Tovilo
f390425db3 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix flaky connection count in mysqli test
 2025-03-13 16:46:03 +01:00
Ilija Tovilo
00ebd2d7f2 Fix flaky connection count in mysqli test 
Use connection ID instead of count to check whether we're using a
persistent connection. This allows the test to be run in parallel with
the other tests, but also protects against the possibility that some
other service connects to the mysql server.

Closes GH-18040
 2025-03-13 16:40:33 +01:00
Calvin Buckley
a30a41af78 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Skip mysqli/tests/bug73462 on PPC CI (#17971)
 2025-03-05 10:19:52 -04:00
Calvin Buckley
1afbaaa804 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Skip mysqli/tests/bug73462 on PPC CI (#17971)
 2025-03-05 10:18:41 -04:00
Calvin Buckley
dc6586dd9d Skip mysqli/tests/bug73462 on PPC CI (#17971) 
* Skip this test on PPC CI

Seems to be unfortunately flaky with persistent connections.

* use spaces in phpt file
 2025-03-05 10:17:39 -04:00
Jakub Zelenka
191e16b703 Merge branch 'PHP-8.2' into PHP-8.3 2025-01-19 20:38:19 +01:00
Jakub Zelenka
5d632230ba Merge branch 'PHP-8.1' into PHP-8.2 2025-01-19 20:37:53 +01:00
Jakub Zelenka
235d1b14a3 Fix GH-17499: mysqli flaky test: ghsa-h35g-vwh6-m678-stmt-row-string 2025-01-19 20:36:12 +01:00
Jakub Zelenka
5168a2f5ba Merge branch 'PHP-8.2' into PHP-8.3 2024-12-09 23:37:03 +01:00
Jakub Zelenka
d18768e231 Merge branch 'PHP-8.1' into PHP-8.2 2024-12-09 23:36:36 +01:00
Jakub Zelenka
39c292b1eb Use empheral port for mysqli fake server tests 2024-12-09 23:34:50 +01:00
Niels Dossche
51e0920e45 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix some MariaDB test failures
 2024-12-02 19:21:03 +01:00
Niels Dossche
1a6f8a0b79 Fix some MariaDB test failures 
Allow other wording too such that these mysqli tests pass.

Closes GH-17004.
 2024-12-02 19:20:54 +01:00
Jakub Zelenka
ac57b81c7c Merge branch 'PHP-8.2' into PHP-8.3 2024-11-24 23:49:29 +01:00
Jakub Zelenka
173175badd Merge branch 'PHP-8.1' into PHP-8.2 2024-11-24 23:49:04 +01:00
Jakub Zelenka
eb951b3d11 Increase MySQLi fake server read timeout for ASAN job 2024-11-24 23:48:27 +01:00
Jakub Zelenka
b707f42119 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-24 20:15:02 +01:00
Jakub Zelenka
06082671f4 Merge branch 'PHP-8.1' into PHP-8.2 2024-11-24 20:14:29 +01:00
Jakub Zelenka
51f5539914 Change port for mysqli fake server auth message test 2024-11-24 20:13:47 +01:00
Jakub Zelenka
c70b97d8eb Make MySQLnd protocol stmt test work on 32bit 
Closes GH-16869.
 2024-11-20 13:52:53 +01:00
Jakub Zelenka
ffff27f734 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-20 11:12:19 +01:00
Jakub Zelenka
a21e48a93a Make MySQLnd protocol stmt test work on 32bit 2024-11-20 11:06:43 +01:00
Jakub Zelenka
c595455300 Fix GHSA-h35g-vwh6-m678: Mysqlnd - various heap buffer over-reads 
This fixes issues causing buffer over-read that leak heap content:
- RESP packet field default left over for COM_LIST
- RESP packet upsert filename
- OK packet message
- RESP packet for stmt row data
  - ps_fetch_from_1_to_8_bytes
  - ps_fetch_float
  - ps_fetch_double
  - ps_fetch_time
  - ps_fetch_date
  - ps_fetch_datetime
  - ps_fetch_string
  - ps_fetch_bit
- RESP packet for query row data (just possible overflow on 32bit)

It also adds various protocol tests using a new fake server.
 2024-11-20 11:06:26 +01:00
Jakub Zelenka
2f5aa9f9d1 Fix GHSA-h35g-vwh6-m678: Mysqlnd - various heap buffer over-reads 
This fixes issues causing buffer over-read that leak heap content:
- RESP packet field default left over for COM_LIST
- RESP packet upsert filename
- OK packet message
- RESP packet for stmt row data
  - ps_fetch_from_1_to_8_bytes
  - ps_fetch_float
  - ps_fetch_double
  - ps_fetch_time
  - ps_fetch_date
  - ps_fetch_datetime
  - ps_fetch_string
  - ps_fetch_bit
- RESP packet for query row data (just possible overflow on 32bit)

It also adds various protocol tests using a new fake server.
 2024-11-17 19:30:13 +01:00
Christoph M. Becker
a3dbd39be0 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15432: Heap corruption when querying a vector
 2024-08-20 15:44:40 +02:00
Christoph M. Becker
b1211c1e4a Fix GH-15432: Heap corruption when querying a vector 
Since the mysqlnd result set is arena allocated, we must not simply
free it, but rather call the appropriate `free_result` method.

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-08-20 15:43:21 +02:00
Kamil Tekiela
05efcc245e Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Clear mysql error in fetch_into
 2024-05-17 13:13:18 +02:00
Kamil Tekiela
a59868aef8 Clear mysql error in fetch_into 
Closes GH-14256
 2024-05-17 13:08:42 +02:00
Jakub Zelenka
fbcad699cb Merge branch 'PHP-8.2' into PHP-8.3 2024-04-12 10:57:42 +01:00
Jakub Zelenka
3b93f13199 Revert "ext/mysqlnd: support ER_CLIENT_INTERACTION_TIMEOUT" 
This reverts commit 5035b85090.

This broke Doctrine DBAL tests - more discussion in GH-13618.
 2024-04-12 10:56:09 +01:00
Kamil Tekiela
acf9047346 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  ext/mysqlnd: support ER_CLIENT_INTERACTION_TIMEOUT
 2024-04-10 13:35:14 +02:00
Appla
5035b85090 ext/mysqlnd: support ER_CLIENT_INTERACTION_TIMEOUT 
Closes GH-13618.
 2024-04-10 13:33:04 +02:00
Saki Takamachi
1f7df80b43 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Changed the test expected value of `mysqli::info` to `%s` (#13723)
 2024-03-16 00:14:38 +09:00
Saki Takamachi
23eb6a00e2 Changed the test expected value of mysqli::info to %s (#13723) 
Closes #13723
Fixes #13628
 2024-03-16 00:14:18 +09:00
Niels Dossche
87728105b9 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12107: When running a stored procedure (that returns a result set) twice, PHP crashes
 2024-01-19 23:35:23 +01:00
Niels Dossche
0d21a8dcb5 Fix GH-12107: When running a stored procedure (that returns a result set) twice, PHP crashes 
Closes GH-12771.
 2024-01-19 23:34:12 +01:00
Kamil Tekiela
ee82c94208 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix failing test on nightly
 2023-08-17 18:46:28 +01:00
Kamil Tekiela
6d039d282a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix failing test on nightly
 2023-08-17 18:45:49 +01:00
Kamil Tekiela
ffd398b4fe Fix failing test on nightly 2023-08-17 18:45:10 +01:00
Kamil Tekiela
7e4ca2e8d9 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix implicit/explicit port in mysqlnd

Closes GH-11990
 2023-08-16 20:34:48 +01:00
Kamil Tekiela
06bda99280 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix implicit/explicit port in mysqlnd
 2023-08-16 20:33:52 +01:00
Kamil Tekiela
c1103a9772 Fix implicit/explicit port in mysqlnd 2023-08-16 18:59:07 +01:00
Kamil Tekiela
0b887042ae mysqli_field_seek return type changed to true (#11948) 2023-08-14 19:04:34 +01:00
Ilija Tovilo
fc9266a5fc Move ASAN built to GitHub actions 
Cirrus will no longer offer unlimited free builds starting next month. We don't
have an alternative for FreeBSD and ARM, so move what we can for now.

Closes GH-11898
 2023-08-09 14:06:36 +02:00
Kamil Tekiela
82934746b7 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix MySQL Statement has a empty query result when the response field has changed, also Segmentation fault
 2023-08-04 22:54:30 +01:00
Kamil Tekiela
4db701c049 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix MySQL Statement has a empty query result when the response field has changed, also Segmentation fault
 2023-08-04 22:31:18 +01:00
Yurun
ca5d48213a Fix MySQL Statement has a empty query result when the response field has changed, also Segmentation fault 
Closes GH-11551.
 2023-08-04 22:25:01 +01:00
Niels Dossche
babe247827 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix missing link variable in test
 2023-08-03 21:12:09 +02:00
Niels Dossche
77417f81cb Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix missing link variable in test
 2023-08-03 21:12:04 +02:00