Skip to content

sync #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 268 commits into from
Jun 15, 2023
Merged

sync #22

Changes from 1 commit
Commits
Show all changes
268 commits
Select commit Hold shift + click to select a range
baa07f3
Fix GH-11180: hash_file() appears to be restricted to 3 arguments
nielsdos May 6, 2023
e673056
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 7, 2023
f6e296d
Merge branch 'PHP-8.2'
nielsdos May 7, 2023
8533856
Narrow bool return types to true when possible
kocsismate May 7, 2023
281669a
Add support for true standalone type when generating methodsynopsis
kocsismate May 7, 2023
37e6594
Fix gmp_long/gmp_ulong typedef warning on Windows x86 (#11112)
mvorisek May 7, 2023
78ec64a
Fix use-of-uninitialized value in phar_object.c
iluuu1994 May 7, 2023
b71a961
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 8, 2023
38cf52d
Merge branch 'PHP-8.2'
iluuu1994 May 8, 2023
06fe9ff
Fix use-of-undefined in zend_fiber_object_gc of ex->call
iluuu1994 May 8, 2023
173680a
Merge branch 'PHP-8.2'
iluuu1994 May 9, 2023
acc9406
Remove unnecessary NULL assignments after ecalloc in streams (#11209)
nielsdos May 9, 2023
6ba0b06
Fix GH-8426: make test fail while soap extension build
nielsdos May 8, 2023
44491d1
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 9, 2023
63a84a2
Merge branch 'PHP-8.2'
nielsdos May 9, 2023
175ff60
Fix compilation error on old GCC versions
ingamedeo May 9, 2023
6692477
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 10, 2023
7304b56
Merge branch 'PHP-8.2'
iluuu1994 May 10, 2023
975d28e
Fix GH-11222: foreach by-ref may jump over keys during a rehash
bwoebi May 10, 2023
53558ff
Merge branch 'PHP-8.1' into PHP-8.2
bwoebi May 10, 2023
0787247
Merge branch 'PHP-8.2'
bwoebi May 10, 2023
09dd3e3
Narrow some more return types to true
kocsismate May 10, 2023
8f66b67
Fix compilation for PHP 8.1
iluuu1994 May 10, 2023
5e962f6
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 10, 2023
5820528
Merge branch 'PHP-8.2'
iluuu1994 May 10, 2023
ad747d9
[skip ci] Remove NEWS entry for reverted change in PHP 8.1
iluuu1994 May 11, 2023
c47c64e
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 11, 2023
6a2d041
Merge branch 'PHP-8.2'
iluuu1994 May 11, 2023
12c30a8
[skip ci] Add missing --no-progress flag to ARM build
iluuu1994 May 11, 2023
c71cf06
Merge branch 'PHP-8.2'
iluuu1994 May 11, 2023
0a04c00
Fix potential NULL pointer access in zend_fiber_object_gc
iluuu1994 May 11, 2023
8d8cfe2
Merge branch 'PHP-8.2'
iluuu1994 May 11, 2023
730f32b
Keep the orig_path for xport stream
iamluc Apr 20, 2023
e349913
Fix delayed early binding class redeclaration error
iluuu1994 May 10, 2023
e0af7c3
Merge branch 'PHP-8.2'
iluuu1994 May 12, 2023
7b76848
Fix GH-10834: exif_read_data() cannot read smaller stream wrapper chu…
nielsdos Mar 24, 2023
d369a77
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 12, 2023
2fa8473
Merge branch 'PHP-8.2'
nielsdos May 12, 2023
1029537
Fix GH-10461: Postpone FPM child freeing in event loop
bukka Apr 15, 2023
bda28eb
Merge branch 'PHP-8.1' into PHP-8.2
bukka May 13, 2023
7034263
Merge branch 'PHP-8.2'
bukka May 13, 2023
e8a836e
Expose JSON internal function to escape string
bukka Apr 10, 2023
5e64ead
Fix bug #64539: FPM status - query_string not properly JSON encoded
bukka Apr 10, 2023
90553af
Merge branch 'PHP-8.1' into PHP-8.2
bukka May 13, 2023
a225f6a
Merge branch 'PHP-8.2'
bukka May 13, 2023
4294e8d
FPM: Fix memory leak for invalid primary script file handle
bukka Apr 16, 2023
1129046
Merge branch 'PHP-8.1' into PHP-8.2
bukka May 14, 2023
03f64b7
Merge branch 'PHP-8.2'
bukka May 14, 2023
ac41608
Fix -Wenum-int-mismatch warning in ext/json/php_json_encoder.h
iluuu1994 May 14, 2023
6bd5464
Cacheline demote to improve performance (#11101)
May 15, 2023
0600f51
Implement delayed early binding for classes without parents
iluuu1994 May 10, 2023
aa553af
Fix segfault in mb_strrpos/mb_strripos with ASCII encoding and negati…
iluuu1994 May 10, 2023
c5a623b
Added negative offset test for mb_strrpos
rgeraads May 10, 2023
6408fb2
Merge branch 'PHP-8.2'
iluuu1994 May 15, 2023
aae39fe
Fix #9483: Fix autoconf warnings due to old libtool (#11207)
petk May 15, 2023
e35cd34
Fix assertion warning message when no description is provided
Girgias May 16, 2023
80c8ca9
Use uint32_t for variable storing ZEND_NUM_ARGS()
Girgias May 16, 2023
97e29be
Use shared, immutable array for return value of mb_list_encodings
alexdowad Apr 22, 2023
3ab10da
Take order of candidate encodings into account when guessing text enc…
alexdowad Apr 30, 2023
7914b8c
Use pakutoma's encoding check functions for mb_detect_encoding even i…
alexdowad May 11, 2023
727e26f
Fix #97836 and #81705: Segfault / type confusion in concat_function
nielsdos Dec 4, 2022
bd03c03
Allow CTE on more CTE safe functions (#10771)
mvorisek May 16, 2023
e31fe11
[skip ci] Mark frequently failing fpm test as XFAIL
iluuu1994 May 17, 2023
69d41cc
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 17, 2023
8d0345d
Merge branch 'PHP-8.2'
iluuu1994 May 17, 2023
aa061cd
Fix FPM status json encoded value test
bukka May 19, 2023
3769505
Merge branch 'PHP-8.1' into PHP-8.2
bukka May 19, 2023
e5d46b3
Merge branch 'PHP-8.2'
bukka May 19, 2023
1ede313
Fix GH-11274: POST/PATCH request via file_get_contents + stream_conte…
nielsdos May 19, 2023
45897f5
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 19, 2023
afcf97b
Merge branch 'PHP-8.2'
nielsdos May 19, 2023
1fe7dc3
Fix -Wstrict-prototypes warnings in fuzzer SAPI (#11277)
nielsdos May 20, 2023
93fa961
Fix GH-11099: Generating phar.php during cross-compile can't be done
peter279k May 15, 2023
ffae350
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 20, 2023
a94fe87
Merge branch 'PHP-8.2'
nielsdos May 20, 2023
548e061
FPM: refactor fpm_php_get_string_from_table() to better match usage (…
Girgias May 20, 2023
c717c79
Combine CJK encoding conversion code in a single source file
alexdowad Apr 14, 2023
73633bf
Optimize conversion of SJIS-2004 text to Unicode
alexdowad Apr 18, 2023
175154d
Optimize conversion of CP932 text to Unicode
alexdowad Apr 18, 2023
245daed
Move kana translation tables to mbfilter_cjk.c
alexdowad Apr 22, 2023
f337c92
Test mb_strlen for all text encodings supported by mbstring
alexdowad May 16, 2023
8e6be14
Fix problem with CP949 conversion when 0xC9 precedes byte lower than …
alexdowad May 16, 2023
18ca489
Convert mbfilter_conv{,_r}_map_tbl to return bool
alexdowad May 21, 2023
03b163b
Remove unused variable err in mb_send_mail() (#11285)
nielsdos May 21, 2023
c230aa9
Correctly handle multiple constants in typed declaration
nikic May 20, 2023
5c74164
Fix string coercion for $a .= $a (#11296)
iluuu1994 May 22, 2023
7790ee8
Fix concat_function use-after-free on out-of-memory error (#11297)
iluuu1994 May 22, 2023
5cad1a7
Fix GH-11245 (In some specific cases SWITCH with one default statemen…
nielsdos May 16, 2023
f656344
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 22, 2023
24ff7ee
Merge branch 'PHP-8.2'
nielsdos May 22, 2023
a2af8ac
Fix the JIT buffer relocation failure at the corner case (#11266)
LoongT4o May 23, 2023
f9117eb
Fix GH-11281: DateTimeZone::getName() does not include seconds in offset
nielsdos May 19, 2023
caab608
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 23, 2023
505a30c
Merge branch 'PHP-8.2'
nielsdos May 23, 2023
d5f68b5
PHP-8.2 is now for PHP 8.2.8-dev
adoy May 23, 2023
a05d58d
Merge branch 'PHP-8.2'
adoy May 23, 2023
2f2fd06
PHP-8.1 is now for PHP 8.1.21-dev
ramsey May 23, 2023
f90fd01
Merge branch 'PHP-8.1' into PHP-8.2
ramsey May 23, 2023
f36d09d
Merge branch 'PHP-8.2'
ramsey May 23, 2023
2eee46e
ext/session: pass ini options to extra processes in tests (#11294)
mikhainin May 24, 2023
f5c54fd
Fix access on NULL pointer in array_merge_recursive()
iluuu1994 May 23, 2023
4676d9b
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 24, 2023
ded8b7f
Merge branch 'PHP-8.2'
iluuu1994 May 24, 2023
7c7698f
Fix preg_replace_callback_array() pattern validation
iluuu1994 May 23, 2023
32968f8
Merge branch 'PHP-8.2'
iluuu1994 May 24, 2023
b2ec6c2
Fix exception handling in array_multisort()
iluuu1994 May 23, 2023
0ee4371
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 24, 2023
a59c933
Merge branch 'PHP-8.2'
iluuu1994 May 24, 2023
1c733c8
Use zend_ast_apply in zend_eval_const_expr (#11261)
iluuu1994 May 24, 2023
6267601
Fix allocation loop in zend_shared_alloc_startup()
nielsdos May 23, 2023
bbcf9e7
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 24, 2023
3189a9f
Merge branch 'PHP-8.2'
nielsdos May 24, 2023
0b1d750
Allow arbitrary expressions in static variable initializer
iluuu1994 Aug 11, 2022
5ff244d
[skip ci] Fix linguist-generated for zend_vm_opcodes files
iluuu1994 May 24, 2023
eb7ec15
Use single allocation for indirect values in array_multisort
iluuu1994 May 24, 2023
150825d
[skip ci] Fix release date of PHP 8.2.7
adoy May 25, 2023
04b1bc3
Merge branch 'PHP-8.2'
adoy May 25, 2023
8946b7b
Access violation when ALLOC_FALLBACK fixed
KoudelkaB May 24, 2023
5b8e941
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 25, 2023
adb3d52
Merge branch 'PHP-8.2'
iluuu1994 May 25, 2023
cba335d
Fix GH-11288 and GH-11289 and GH-11290 and GH-9142: DOMExceptions and…
nielsdos May 22, 2023
af72727
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 25, 2023
56b1c11
Merge branch 'PHP-8.2'
nielsdos May 25, 2023
5b033b0
Fix zend_jit_stop_counter_handlers() performance issues with protect_…
iluuu1994 May 25, 2023
2d86e95
Merge branch 'PHP-8.2'
iluuu1994 May 26, 2023
b5a07a7
[skip ci] Fix race condition in readline test
iluuu1994 May 26, 2023
b47a7d4
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 26, 2023
58a191c
Merge branch 'PHP-8.2'
iluuu1994 May 26, 2023
8ed66b4
Add tests for list() in assignment in array literals
iluuu1994 May 25, 2023
fbe6696
Revert "Use zend_ast_apply in zend_eval_const_expr (#11261)"
iluuu1994 May 26, 2023
1dfa277
Fix GCC 12 compilation on riscv64
danog May 25, 2023
350e449
Merge branch 'PHP-8.1' into PHP-8.2
devnexen May 27, 2023
2e4369a
Merge branch 'PHP-8.2'
devnexen May 27, 2023
f249958
[skip ci] Add more patterns to run-tests.php retry list
iluuu1994 May 27, 2023
f735543
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 27, 2023
2d883a6
Merge branch 'PHP-8.2'
iluuu1994 May 27, 2023
b884011
Shrink libxml_doc_props struct (#11326)
nielsdos May 29, 2023
c473787
Fix GH-10234: Setting DOMAttr::textContent results in an empty attrib…
nielsdos Jan 6, 2023
9ff1ea6
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 29, 2023
99ec0c1
Merge branch 'PHP-8.2'
nielsdos May 29, 2023
b495a91
Add string output escaping into zend dump (phpdbg + opcache debug) (#…
SerafimArts May 29, 2023
761b9a4
Fix return value in stub file for DOMNodeList::item
divinity76 May 29, 2023
dfa8987
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 29, 2023
f90962d
Merge branch 'PHP-8.2'
nielsdos May 29, 2023
bce5360
Fix GH-11338: SplFileInfo empty getBasename with more than one slash
nielsdos May 29, 2023
9c59d22
Fix GH-11336: php still tries to unlock the shared memory ZendSem wit…
nielsdos May 29, 2023
154c251
Fix spec compliance error for DOMDocument::getElementsByTagNameNS
nielsdos May 29, 2023
b374ec3
Fix DOMElement::append() and DOMElement::prepend() hierarchy checks
nielsdos May 29, 2023
0e7ad40
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 30, 2023
1ed6868
Merge branch 'PHP-8.2'
nielsdos May 30, 2023
d8102e6
Remove unnecessary tree setting in dom_zvals_to_fragment()
nielsdos May 29, 2023
c6655fb
Implement dom_get_doc_props_read_only()
nielsdos May 29, 2023
c50172e
Fix mb_strlen is wrong length for CP932 when 0x80.
youkidearitai May 29, 2023
c33589e
Merge branch 'PHP-8.1' into PHP-8.2
alexdowad May 30, 2023
6930ef5
Merge branch 'PHP-8.2'
alexdowad May 30, 2023
c6ae7a5
Fix bug GH-11246 cli/get_set_process_title
lucasnetau May 16, 2023
0bf8ecf
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 May 31, 2023
bb48f5d
Merge branch 'PHP-8.2'
iluuu1994 May 31, 2023
7812772
Fix GH-11347: Memory leak when calling a static method inside an xpat…
nielsdos May 30, 2023
8126bea
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos May 31, 2023
91fd564
Merge branch 'PHP-8.2'
nielsdos May 31, 2023
82e761e
Fix [-Wenum-int-mismatch] compiler warnings (#11352)
Girgias Jun 1, 2023
1540245
ext/standard/array.c: Optimize min/max functions for int/float (#11194)
Girgias Jun 2, 2023
f8faa8b
Use zval_ptr_dtor_nogc() for callable in ext/xslt (#11356)
nielsdos Jun 2, 2023
79128af
[skip ci] Update release process to publish php-keyring.gpg in web-php
adoy Jun 2, 2023
810507a
http_fopen_wrapper: fix [-Wanalyzer-deref-before-check]
Girgias Jun 2, 2023
13ad8ef
memory stream: fix [-Wanalyzer-deref-before-check]
Girgias Jun 2, 2023
c5d7264
Fix file descriptor check
Girgias Jun 2, 2023
ce724d1
Assert zend_constant exist
Girgias Jun 2, 2023
c3f0797
Implement iteration cache, item cache and length cache for node list …
nielsdos Jun 2, 2023
5fae4b5
Struct-pack spl_dllist_object
nielsdos Jun 3, 2023
c6bffff
Remove dead code from sxe_get_element_by_name()
nielsdos Jun 2, 2023
7951279
Remove double class entry variable
nielsdos Jun 2, 2023
47c277b
Use xmlStrEqual() instead of !xmlStrCmp()
nielsdos Jun 2, 2023
ed097e3
No need for the double name pointer
nielsdos Jun 2, 2023
3da4156
Switch DOMNodeList::item() and DOMNamedNodeMap::item() to fast ZPP (#…
nielsdos Jun 4, 2023
b1d8e24
Fix bug #67440: append_node of a DOMDocumentFragment does not reconci…
nielsdos Jun 3, 2023
23f7002
Fix bug #81642: DOMChildNode::replaceWith() bug when replacing a node…
nielsdos Jun 3, 2023
0e34ac8
Fix bug #77686: Removed elements are still returned by getElementById
nielsdos Jun 4, 2023
5b79c53
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos Jun 4, 2023
e8fb0ed
Merge branch 'PHP-8.2'
nielsdos Jun 4, 2023
a720268
Use uint32_t for the number of nodes (#11371)
nielsdos Jun 5, 2023
9ce6980
Use known zend_string pointer to check for equality instead of C stri…
Girgias Jun 5, 2023
16a63d7
ext/pgsql: php_pgsql_convert converts E_NOTICE to TypeError/ValueErro…
devnexen May 13, 2023
61e1f8a
Let closure created from magic method accept named parameters
nielsdos Jun 3, 2023
50fdad8
Set DOMAttr::$value without expanding entities
tstarling Dec 19, 2022
74910b1
Factor out dom_remove_all_children()
tstarling Dec 22, 2022
ee68c22
Don't add 1 when calling xmlNodeSetContent()
tstarling Dec 22, 2022
076ddf2
Also avoid entity expansion in DOMAttr::$nodeValue
tstarling Dec 22, 2022
0cc028c
Changelog notes for DOMAttr value and nodeValue properties
tstarling Dec 22, 2022
ab77485
Improve test DOMAttr_entity_expansion.phpt
tstarling Jun 5, 2023
99fa740
Use common function for TypeError on illegal offset access (#10544)
Girgias Jun 6, 2023
8f06feb
Fixed deoptimization info for interrupt handler
dstogov Jun 6, 2023
724e64f
Merge branch 'PHP-8.1' into PHP-8.2
dstogov Jun 6, 2023
376b1ef
Merge branch 'PHP-8.2'
dstogov Jun 6, 2023
a02f7f2
Use more appropriate types for php_array_walk() function
Girgias Jun 6, 2023
e56904a
Disable old libxml2 hack if the version does not suffer from the bug …
nielsdos Jun 6, 2023
5b430a2
Update NEWS for PHP 8.3.0alpha1
bukka Jun 6, 2023
cced0dd
Fix test failure for init_fcall_003.phpt without opcache
nielsdos Jun 5, 2023
1de5c50
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos Jun 6, 2023
919f27b
Merge branch 'PHP-8.2'
nielsdos Jun 6, 2023
ac4254a
Fix missing randomness check and insufficient random bytes for SOAP H…
nielsdos Apr 16, 2023
0572448
Fix GH-11382 add missing hash header for bin2hex
remicollet Jun 6, 2023
b720ab9
Update NEWS
adoy Jun 6, 2023
a5b8bfc
Merge branch 'PHP-8.0' into PHP-8.1
adoy Jun 6, 2023
5604f7a
Update NEWS
adoy Jun 6, 2023
38e4e58
Merge branch 'PHP-8.1' into PHP-8.2
adoy Jun 6, 2023
269d6c5
Update NEWS
adoy Jun 6, 2023
c790373
Merge branch 'PHP-8.2'
adoy Jun 6, 2023
938ebb3
Add example commit message to release process doc
ramsey Jun 6, 2023
ca19051
Add PHP 8.3 to release process doc; remove 7.4
ramsey Jun 6, 2023
0561783
ensure session.sid_length have proper value for test
remicollet Jun 6, 2023
8e01517
[ci skip] Fix inaccurate comment
nielsdos Jun 7, 2023
6e04050
Remove redundant assignment on nodep->ns
nielsdos Jun 5, 2023
bde6f2a
Fix initial array size in `gc_status()` (#11393)
realFlowControl Jun 7, 2023
79d024a
Allow final modifier when using a method from a trait (#11394)
nielsdos Jun 7, 2023
06d6873
Keep consistent EG(current_execute_data) after return from generator …
dstogov Jun 8, 2023
42619b2
Merge branch 'PHP-8.1' into PHP-8.2
dstogov Jun 8, 2023
962a777
Merge branch 'PHP-8.2'
dstogov Jun 8, 2023
d5ad751
More usage of known zend_str instead of C string (#11381)
Girgias Jun 8, 2023
a6911cb
Suppress warning when the test run under non-root (#11400)
mikhainin Jun 8, 2023
50b4df1
Get rid of return value for php_libxml_unregister_node() (#11398)
nielsdos Jun 8, 2023
a38e3c9
Fix #79700: Bad performance with namespaced nodes due to wrong libxml…
nielsdos Jun 5, 2023
709540c
Fix add/remove observer API with multiple observers installed
bwoebi Jun 9, 2023
95e6ce6
Merge branch 'PHP-8.2'
bwoebi Jun 9, 2023
fd09728
Fix bug GH-9356: Incomplete SAN validation of IPv6 address
lucasnetau Apr 28, 2023
58141f0
Merge branch 'PHP-8.1' into PHP-8.2
bukka Jun 9, 2023
45eae90
Merge branch 'PHP-8.2'
bukka Jun 9, 2023
3fc013b
Fix CS and checking for IPv6 SAN verify
bukka Jun 9, 2023
d687a1b
Merge branch 'PHP-8.1' into PHP-8.2
bukka Jun 9, 2023
981f01e
Merge branch 'PHP-8.2'
bukka Jun 9, 2023
f2d673f
Fix #70359 and #78577: segfaults with DOMNameSpaceNode
nielsdos Jun 8, 2023
2cbb0c0
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos Jun 9, 2023
30c5ae4
Merge branch 'PHP-8.2'
nielsdos Jun 9, 2023
d22d0e2
Implement GH-8641: STREAM_NOTIFY_COMPLETED over HTTP never emitted
nielsdos Feb 4, 2023
49fbbea
Fix GH-10406: fgets on a redis socket connection fails on PHP 8.3
bukka Jun 10, 2023
e309fd8
Fix lifetime issue with getAttributeNodeNS()
nielsdos Jun 10, 2023
10d94ac
Fix "invalid state error" with cloned namespace declarations
nielsdos Jun 11, 2023
a8a3b99
Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL
nielsdos Jun 12, 2023
c160693
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos Jun 13, 2023
18f2f0a
Merge branch 'PHP-8.2'
nielsdos Jun 13, 2023
5c78980
Fix GH-11406: segfault with unpacking and magic method closure
nielsdos Jun 9, 2023
dd8514a
ext/pgsql: adding pg_set_error_context_visibility.
devnexen Jun 7, 2023
ec3daea
ext/pdo_pgsql: connection status update to distinguish from truly bad…
devnexen Jun 12, 2023
4fcb3e0
Fix cross-compilation check in phar generation for FreeBSD
peter279k Jun 12, 2023
a9c6b84
Merge branch 'PHP-8.1' into PHP-8.2
nielsdos Jun 13, 2023
1a5a537
Merge branch 'PHP-8.2'
nielsdos Jun 13, 2023
38b5e94
[ci skip] Add myself to CODEOWNERS for dom and libxml (#11449)
nielsdos Jun 13, 2023
85a4a80
ext/imap: Refactor + Update to modern property write API (#11415)
Girgias Jun 14, 2023
96ea06a
Add test for GH-11423
kocsismate Jun 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix -Wenum-int-mismatch warning in ext/json/php_json_encoder.h
  • Loading branch information
iluuu1994 committed May 14, 2023
commit ac41608797d7d9258d3ccbf35a0ee55631d157ee
2 changes: 1 addition & 1 deletion ext/json/php_json_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ static inline void php_json_encode_init(php_json_encoder *encoder)

zend_result php_json_encode_zval(smart_str *buf, zval *val, int options, php_json_encoder *encoder);

int php_json_escape_string(smart_str *buf, const char *s, size_t len, int options, php_json_encoder *encoder);
zend_result php_json_escape_string(smart_str *buf, const char *s, size_t len, int options, php_json_encoder *encoder);

#endif /* PHP_JSON_ENCODER_H */