Repository navigation
Commit a8e56fd
committed
Merge remote-tracking branch 'upstream/PHP-8.6' into true-async
Upstream master moved to 8.7.0-dev; true-async stays on 8.6, so it now
follows PHP-8.6 instead of master.
Conflicts:
- Zend/zend_atomic.h: kept the fork's fetch_add/fetch_sub helpers next to
upstream's ZEND_ATOMIC_FENCE_* macros.
- Zend/zend_fibers.c: upstream holds the object a callable resolved to
(php#24134); applied to the non-coroutine path. The coroutine path keeps
zend_fcall_t, which does not hold fci.object yet.
- ext/pdo/pdo_dbh.c: added upstream's persistent refcount guard (phpGH-23962)
to the fork's in_txn check, which avoids dispatching to the pool.
- ext/standard/http_fopen_wrapper.c: took upstream's single release of the
last response headers after the request; it also covers headers stored
by another coroutine.
- main/streams/cast.c: the fork's buffer locking with the new
PHP_STREAM_AS_FD_FOR_POLL exemption.
- main/streams/streams.c: flush/close results propagate (bug #60110) while
the lock-free flush on close and pending_free stay.1,445 files changed
Lines changed: 76432 additions & 40259 deletions
File tree
- .claude
- .github
- actions
- brew
- freebsd
- scripts
- download-bundled
- windows
- workflows
- TSRM
- Zend
- Optimizer
- tests
- asymmetric_visibility
- attributes/delayed_target_validation
- closures
- deprecated_identifiers
- is
- let
- readonly
- enum
- fibers
- generators/finally
- grammar
- lazy_objects
- nullsafe_operator
- partial_application
- property_hooks
- readonly_props
- try
- type_declarations
- iterable
- relative_types
- static
- build
- ext
- bcmath
- libbcmath/src
- tests/number/methods
- bz2
- tests
- curl
- tests
- date
- lib
- tests
- time/duration
- methods
- dl_test
- tests
- dom
- parentnode
- tests
- modern
- css_selectors
- html
- interactions
- parser
- spec
- ffi
- tests
- fileinfo
- libmagic
- tests
- upstream
- ftp
- tests
- gd/tests
- gettext
- hash
- murmur
- tests
- iconv
- intl
- collator
- converter
- dateformat
- formatter
- grapheme
- msgformat
- tests
- uchar
- tests
- lexbor
- lexbor
- css/selectors
- encoding
- unicode
- url
- patches
- libxml
- mbstring
- libmbfl
- filters
- mbfl
- tests
- mysqli
- tests
- mysqlnd
- opcache
- jit
- ir
- dynasm
- tests
- jit
- opt
- openssl
- tests
- pcntl
- tests
- pdo_dblib
- tests
- pdo_firebird
- tests
- pdo_mysql/tests
- pdo_odbc
- tests
- pdo_pgsql/tests
- pdo_sqlite/tests
- pdo
- tests
- pgsql
- tests
- phar
- tests
- tar
- posix
- tests
- random
- tests/03_randomizer
- readline
- tests
- reflection
- tests
- gh22681
- session
- tests
- user_session_module
- shmop/tests
- simplexml/tests
- snmp
- tests
- soap
- tests
- bugs
- gh23686
- sockets
- tests
- sodium
- tests
- spl
- tests
- ArrayObject
- autoloading
- sqlite3
- tests
- standard
- tests
- array
- array_walk
- gh16649
- in_array
- range
- sort
- assert
- class_object
- dir
- file
- filters
- general_functions
- http
- request_parse_body
- image
- ini_info
- mail
- math
- misc
- network
- password
- poll
- serialize
- unserialize_callback_func
- streams
- strings
- time
- url
- versioning
- tidy
- tests
- uri
- tests
- rfc3986/getters
- whatwg
- builder
- getters
- modification
- parsing
- xml
- tests
- xsl
- tests
- zend_test
- tests
- zip
- tests
- zlib
- tests
- main
- poll
- streams
- sapi
- apache2handler
- cli
- tests
- fpm/tests
- fuzzer
- litespeed
- phpdbg
- tests
- tests
- output
- security
- win32
- build
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
127 | | - | |
128 | 128 | | |
129 | | - | |
130 | | - | |
131 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
94 | 97 | | |
95 | 98 | | |
96 | 99 | | |
| |||
111 | 114 | | |
112 | 115 | | |
113 | 116 | | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
217 | 232 | | |
218 | 233 | | |
219 | 234 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
312 | 312 | | |
313 | 313 | | |
314 | 314 | | |
315 | | - | |
| 315 | + | |
316 | 316 | | |
317 | 317 | | |
318 | 318 | | |
| |||
345 | 345 | | |
346 | 346 | | |
347 | 347 | | |
348 | | - | |
| 348 | + | |
349 | 349 | | |
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
353 | 353 | | |
354 | | - | |
| 354 | + | |
355 | 355 | | |
356 | 356 | | |
357 | 357 | | |
358 | 358 | | |
359 | | - | |
| 359 | + | |
360 | 360 | | |
361 | 361 | | |
362 | 362 | | |
| |||
853 | 853 | | |
854 | 854 | | |
855 | 855 | | |
856 | | - | |
| 856 | + | |
857 | 857 | | |
858 | 858 | | |
859 | 859 | | |
| |||
0 commit comments