archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
134067 commits 526 branches 1434 tags 866 MiB
Commit graph

65313 commits

Author SHA1 Message Date
David Carlier
7e4519670a
Fix GH-13932: Attempt to fix mbstring on windows build (msvc). 
Build failure due to lack of VLA support in older compiler versions.
 2024-04-10 07:03:33 -07:00
Niels Dossche
88953d1361
Adapt regression test 2024-04-09 11:09:54 -07:00
Alex Dowad
f7e73704ad
Fix infinite loop in mb_encode_mimeheader 2024-04-09 11:09:53 -07:00
Jakub Zelenka
6a5c04d01d
Fix bug GHSA-q6x7-frmf-grcw: password_verify can erroneously return true 
Disallow null character in bcrypt password
 2024-04-09 11:09:33 -07:00
Niels Dossche
f77e5794c4
Fix GHSA-wpj3-hf5j-x4v4: __Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix 
The check happened too early as later code paths may perform more
mangling rules. Move the check downwards right before adding the actual
variable.
 2024-04-09 11:09:06 -07:00
Jakub Zelenka
0d89b54759
Add proc_open escaping for cmd file execution 2024-04-09 11:08:35 -07:00
Niels Dossche
67ce1d859d Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix incorrect charset length in check_mb_eucjpms()
 2024-03-22 11:32:15 +01:00
Niels Dossche
8ffac997aa Fix incorrect charset length in check_mb_eucjpms() 
Closes GH-13781.
 2024-03-22 11:31:36 +01:00
Vincent Langlet
741570c30f Fix phpdoc for DOMDocument load methods 
Closes GH-13763.
 2024-03-20 17:22:04 +01:00
David Carlier
f2ec6e4806 Merge branch 'PHP-8.2' into PHP-8.3 2024-03-19 22:35:18 +00:00
David Carlier
db063cb771 CI: update freebsd 13 image. 
13.2 is going to be EOL.

close GH-13622
 2024-03-19 22:34:56 +00:00
Bob Weinand
6d6cd29909 Merge branch 'PHP-8.2' of https://github.com/php/php-src into PHP-8.3 2024-03-18 19:04:12 +01:00
Bob Weinand
10d912d6e3
Fix GH-13712: Segmentation fault for enabled observers when calling trait method of internal trait when opcache is loaded (#13735) 
Inherited methods regardless of source must share the original runtime cache. Traits were missed.
This adds ZEND_ACC_TRAIT_CLONE to internal functions as well to allow easy distinction of these.
 2024-03-18 19:02:42 +01:00
Bob Weinand
35aef8ee87 Merge branch 'PHP-8.2' of https://github.com/php/php-src into PHP-8.3 2024-03-18 17:22:23 +01:00
Bob Weinand
6fb8b9d721 Fix possible segfault with 0x0 shared opcache base 
Moving the minimum base of the shared opcache memory to the second huge page to avoid a possible 0x0 base, which may cause all sorts of segfaults.
This is not a problem on most systems which have a mmap_min_addr which is non-zero, but e.g. WSL1 doesn't have a minimum mapping address.
 2024-03-18 17:18:33 +01:00
Peter Kokot
f66696548b
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests
 2024-03-18 11:58:56 +01:00
Michael Orlitzky
00799320ec
Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests 
In commit 85e5635a, a feature test for the various libgd image formats
was added. That test however erroneously omits the GDLIB_CFLAGS (from
pkg-config) during compilation. This can lead to build failures and
therefore false negatives from the test.

Here, we add $GDLIB_CFLAGS to $CFLAGS for the duration of the test.

Closes GH-12019
 2024-03-18 11:57:20 +01:00
David Carlier
868257a3de Fix GH-13727: macro generating invalid call test prototypes fixes. 
autoconf/libtool generating code to test features missed `void` for
C calls prototypes w/o arguments.
Note that specific changes related to libtool have to be upstreamed.

Co-authored-by: Peter Kokot <petk@php.net>

close GH-13732
 2024-03-18 06:53:39 +00:00
Niels Dossche
dab5f8c15c Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13685: Unexpected null pointer in zend_string.h
 2024-03-17 18:38:36 +01:00
Niels Dossche
aa34e0acb4 Fix GH-13685: Unexpected null pointer in zend_string.h 
Regressed in 6fbf81c.

There is a missing error check on spl_filesystem_file_read_line(), which
means that if the line could not be read (e.g. because we're at the end
of the file), it will not set intern->u.file.current_line, which will
cause a NULL pointer deref later on.

Fix it by adding a check, and reintroducing the silent flag partially to
be able to throw an exception like it did in the past.

Closes GH-13692.
 2024-03-17 18:37:52 +01:00
Niels Dossche
7d1637a48c Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Add missing DOM dependency in config.m4 for ext/xsl
 2024-03-15 22:56:40 +01:00
Niels Dossche
afdabb1247 Add missing DOM dependency in config.m4 for ext/xsl 
Closes GH-13715.
 2024-03-15 22:56:25 +01: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
0f79c22627 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix potential memory leak in XPath evaluation results
 2024-03-14 21:11:19 +01:00
Niels Dossche
30c58aba0c Fix potential memory leak in XPath evaluation results 2024-03-14 21:08:25 +01:00
David Carlier
c24f621f57 Merge branch 'PHP-8.2' into PHP-8.3 2024-03-14 18:59:44 +00:00
David Carlier
db1f7b1286 zend_test fix copy_file_range test for linux 32 bits 
close GH-13708
 2024-03-14 18:59:26 +00:00
David Carlier
bbb6ffa545 Merge branch 'PHP-8.2' into PHP-8.3 2024-03-13 19:35:36 +00:00
David Carlier
334419e157 zend test fix copy_file_range for musl. 
normally should no longer need off64_t with glibc anyway.
 2024-03-13 19:35:23 +00:00
Tim Düsterhus
0d0375ab91
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  random: Initialize the `mode` field when seeding in `php_random_default_status()` (#13690)
 2024-03-13 20:14:42 +01:00
Tim Düsterhus
f34721cabd
random: Initialize the mode field when seeding in php_random_default_status() (#13690) 
This is not just an issue due to missing initialization since moving the state
struct directly into the module globals. In earlier versions changing the mode
to `MT_RAND_PHP` within a single request would also affect the mode for
subsequent requests.

Original commit message follows:

This is a follow-up fix for GH-13579. The issue was detected in the nightly
MSAN build.

(cherry picked from commit bf0abd1629)
 2024-03-13 20:13:48 +01:00
Niels Dossche
b58dc6fd1a Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13680: Segfault with session_decode and compilation error
 2024-03-13 17:49:31 +01:00
Niels Dossche
6985aff7c3 Fix GH-13680: Segfault with session_decode and compilation error 
It's illegal to return from a bailout because that doesn't restore the
original bailout data. Return outside of it.

Test by YuanchengJiang

Closes GH-13689.
 2024-03-13 17:47:25 +01:00
Arnaud Le Blanc
a4d769ccb3 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [ci skip] NEWS
  Fix GH-13508: JITed QM_ASSIGN may be optimized out when op1 is null (#13610)
 2024-03-11 15:13:56 +01:00
Arnaud Le Blanc
0ea80126ea
Fix GH-13508: JITed QM_ASSIGN may be optimized out when op1 is null (#13610) 
Co-authored-by: Dmitry Stogov <dmitry@zend.com>
 2024-03-11 15:10:12 +01:00
Ilija Tovilo
be72bc4b07
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Mark another openssl test as xfail
 2024-03-10 15:15:32 +01:00
Ilija Tovilo
bc6a1c933f
[skip ci] Mark another openssl test as xfail 2024-03-10 15:15:12 +01:00
Niels Dossche
5fc3518426 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix nightly failure due to type in file_put_contents_5gb.phpt
 2024-03-10 11:28:05 +01:00
Niels Dossche
65593e10ef Fix nightly failure due to type in file_put_contents_5gb.phpt 2024-03-10 11:27:47 +01:00
Niels Dossche
134464e451 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Add ZPP checks in DOMNode::{__sleep,__wakeup}
 2024-03-09 23:20:16 +01:00
Niels Dossche
e3711af8ce Add ZPP checks in DOMNode::{__sleep,__wakeup} 
Closes GH-13651.
 2024-03-09 23:19:49 +01:00
Ilija Tovilo
5cbcc10c6c
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Remove MAP_JIT flag
 2024-03-09 23:09:13 +01:00
Ilija Tovilo
00f9c5eeb4
Remove MAP_JIT flag 
This flag is supposed to go on the flags parameter, rather than prot. Moreover,
this flag is no longer needed because the JIT does not set RWX without ZTS, and
JIT+ZTS has been disabled on macOS with Apple Silicon.

Closes GH-13638
 2024-03-09 23:08:44 +01:00
Jakub Zelenka
4612bb77fb
Merge branch 'PHP-8.2' into PHP-8.3 2024-03-09 19:59:06 +00:00
divinity76
2343791aff
Fix GH-13203: file_put_contents fail on strings over 4GB on Windows 
Closes GH-13205
 2024-03-09 19:58:28 +00:00
Ilija Tovilo
a8d575ecef
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Mark problematic openssl tests as xfail for now
 2024-03-08 19:09:27 +01:00
Ilija Tovilo
932982f867
[skip ci] Mark problematic openssl tests as xfail for now 2024-03-08 19:09:14 +01:00
David Carlier
93d89cb80d Merge branch 'PHP-8.2' into PHP-8.3 2024-03-06 11:39:37 +00:00
David Carlier
e3f0d03452 Fix GH-13603 ext/sockets: properly initialised address info data. 
Led to random characters visible on socket id on macOs.

Close GH-13606
 2024-03-06 11:37:48 +00:00