php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,185 Commits 549 Branches 1,485 Tags
35ca407fcbb34bf0cd28fa8a64741abba0637dce
Commit Graph

127185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Carlier 75743eaf1b Merge branch 'PHP-8.0' into PHP-8.1 2022-06-16 12:41:51 +01:00
Heiko Weber a83363e361 FPM: Fix use after free in fpm_evaluate_full_path 
Closes #8796.
 2022-06-16 12:18:01 +01:00
Remi Collet e3c5237b4f NEWS 2022-06-15 15:39:24 +02:00
Remi Collet c76374d26f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  NEWS
  Fix GH-8781 ZipArchive::close deletes zip file without updating stat cache
 2022-06-15 15:39:00 +02:00
Remi Collet 26feb2e6f2 NEWS 2022-06-15 15:38:37 +02:00
Remi Collet 390538af2e Fix GH-8781 ZipArchive::close deletes zip file without updating stat cache 2022-06-15 15:37:27 +02:00
Dmitry Stogov 971b07ea60 JIT: Fix incorrect reference-counting 
This fixes oss-fuzz #47937
 2022-06-14 15:03:50 +03:00
Dmitry Stogov 70e0e1ada6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fix missing register store
 2022-06-14 13:59:47 +03:00
Dmitry Stogov 1cd8074743 JIT: Fix missing register store 
This fixes oss-fuzz #48023
 2022-06-14 13:57:44 +03:00
Dmitry Stogov 6797f338a7 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix use after free
 2022-06-14 12:45:12 +03:00
Dmitry Stogov 0b8e471b3c Fix use after free 
This fixes oss-fuzz #47997
 2022-06-14 12:44:37 +03:00
Dmitry Stogov 729be469ae Fix type inference 
This dixes oss-fuzz #47921
 2022-06-14 11:59:35 +03:00
Dmitry Stogov 1b45efb6fb Fix type inference 
This fixes oss-fuzz #47920
 2022-06-14 10:20:45 +03:00
Christoph M. Becker 4b8bbfb6db Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix handling of single-key connection strings
 2022-06-13 14:43:51 +02:00
Calvin Buckley 445d9502bf Fix handling of single-key connection strings 
A connection string may contain just a single key, but
PHP used ";" as the heuristic to detect if a string was a connection
string versus plain DSN. However, a single-key connection string
would get treated like a DSN name, i.e. "DSN=*LOCAL". This makes it
so that "=" is used, as a connection string must contain a key.

Closes GH-8748.
 2022-06-13 14:41:50 +02:00
Christoph M. Becker 4a8c59d661 [ci skip] Add missing NEWS entry 2022-06-13 14:39:00 +02:00
Alex Dowad 2dc9026cbc Restore backwards-compatible mappings of 0x5C and 0x7E in SJIS 
According to the relevant Japan Industrial Standards Committee standards,
SJIS 0x5C is a Yen sign, and 0x7E is an overline.

However, this conflicts with the implementation of SJIS in various legacy
software (notably Microsoft products), where SJIS 0x5C and 0x7E are taken
as equivalent to the same ASCII bytes.

Prior to PHP 8.1, mbstring's implementation of SJIS handled these bytes
compatibly with Microsoft products. This was changed in PHP 8.1.0, in an
attempt to comply with the JISC specifications. However, after discussion
with various concerned Japanese developers, it seems that the historical
behavior was more useful in the majority of applications which process
SJIS-encoded text.

Since we are now treating SJIS 0x5C as equivalent to U+005C and 0x7E as
equivalent to U+007E, it does not make sense to convert U+203E (OVERLINE)
to 0x7E, nor does it make sense to convert U+00A5 (YEN SIGN) to 0x5C. Restore
the mappings for those codepoints from before PHP 8.1.0.
 2022-06-10 21:04:36 +02:00
Pierrick Charron 77ba689fd6 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-10 12:44:39 -04:00
Pierrick Charron df4dd82ea0 Fix bad integer promotion in mysqlnd big5 charset detection 2022-06-10 12:41:54 -04:00
Remi Collet 8b07921a0c [ci skip] missing CVE 2022-06-10 14:35:12 +02:00
Remi Collet 9261679560 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  [ci skip] missing CVE
  [ci skip] missing CVE
 2022-06-10 14:32:06 +02:00
Remi Collet 62f64141ef [ci skip] missing CVE 2022-06-10 14:31:48 +02:00
Remi Collet ba2d095fe6 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  [ci skip] missing CVE
 2022-06-10 14:28:57 +02:00
Remi Collet 198f3f509d [ci skip] missing CVE 2022-06-10 14:28:31 +02:00
Jakub Zelenka 56382493eb Merge branch 'PHP-8.0' into PHP-8.1 2022-06-09 23:02:50 +01:00
Jakub Zelenka 2f78c1f9d9 Fix and improve OpenSSL VCWD path checking test for bug #50293 2022-06-09 23:01:52 +01:00
Jakub Zelenka 95f6984216 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-09 20:09:57 +01:00
Jakub Zelenka cb9a48a0c5 Pass signature to openssl_verify in bug81713 test 2022-06-09 20:09:08 +01:00
Jakub Zelenka 976cbba76e Merge branch 'PHP-8.0' into PHP-8.1 2022-06-09 19:55:46 +01:00
Jakub Zelenka b765d4cd41 Fix bug #50293 and #81713: file path checking in OpenSSL functions 
It introduces a single function to check file paths passed to OpenSSL
functions. It expands the path, check null bytes and finally does
an open basedir check.
 2022-06-09 19:49:59 +01:00
Pierrick Charron f97a650944 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-09 13:49:45 -04:00
Pierrick Charron e2d55f2f12 Fix LONG_CHECK_VALID_INT in socket extension 2022-06-09 13:48:02 -04:00
Nicolas Grekas 96e3a9d316 Fix RC=1 references of declared properties when casting objects to arrays 
Fixes GH-8655.
Closes GH-8737.
 2022-06-09 13:28:12 +02:00
Christoph M. Becker f768f3d60b Fix recently broken test case 
This test was written to always use the sqlite PDO driver; however,
that driver may no longer be available[1], and actually the test is
supposed to work for all drivers – otherwise it should be placed in
ext/pdo_sqlite/tests.

[1] <https://github.com/php/php-src/commit/938049b92734e37a3c4cbebe4656bfcf8d758d49>

Closes GH-8732.
 2022-06-08 18:33:55 +02:00
Christoph M. Becker 8e2378a4e0 Fix test case 
This test case has apparently been overlooked, when the PDO result
bindings had been rewritten[1].

[1] <https://github.com/php/php-src/commit/caa710037e663fd78f67533b29611183090068b2>
 2022-06-08 17:06:06 +02:00
George Peter Banyard f800c60f13 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-08 11:43:22 +01:00
George Peter Banyard 52eb52d652 Backport fcba0a49fc 
Forgot this file exists in lower branches
 2022-06-08 11:43:12 +01:00
George Peter Banyard c05c96b3fe Fix GH-8691 Add required extensions for redirected tests 2022-06-08 11:37:07 +01:00
George Peter Banyard 938049b927 PDO Common tests should not require a driver 2022-06-08 11:37:07 +01:00
Ben Ramsey 59a3de3786 Fix date on PHP 8.1.7 release 2022-06-07 11:28:41 -05:00
Stanislav Malyshev a0f479f0b6 Update NEWS 2022-06-07 11:26:04 -05:00
Ben Ramsey a6a13139db Fix #76452: Crash while parsing blob data in firebird_fetch_blob 
This reapplies 286162e9b0 to the PHP-8.1 (and up)
branches, fixing what might have been caused by a bad merge conflict resolution.
 2022-06-07 09:59:17 -05:00
Derick Rethans 93eeec81f1 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-07 09:48:29 +01:00
Derick Rethans c15e160a65 Merge branch 'PHP-7.4' into PHP-8.0 2022-06-07 09:48:19 +01:00
Derick Rethans 8fbeadcd45 Bump version in 7.4 to 7.4.31-dev 2022-06-07 09:48:06 +01:00
Máté Kocsis f17a8a5aed Add missing EXTENSIONS section to new test 2022-06-06 12:21:25 +02:00
Dmitry Stogov 74744f3c0d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak
 2022-06-06 11:38:29 +03:00
Dmitry Stogov 088e5677fb Fix memory leak 
This fixes oss-fuzz #47791
 2022-06-06 11:35:01 +03:00
Dmitry Stogov b86c6245cc Fix type inference 
This fixes oss-fuzz #47777
 2022-06-06 11:13:53 +03:00
Stanislav Malyshev 98e1291b7e Merge branch 'PHP-8.0' into PHP-8.1 2022-06-06 01:11:44 -06:00