1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

130957 Commits

Author SHA1 Message Date
Christoph M. Becker bf1cfc0753 Revert GH-10300
Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816>.

This reverts commit 68ada76f9a.
his reverts commit 45384c6e20.
This reverts commit ef7fbfd710.
This reverts commit 9b9ea0d7c6.
This reverts commit f15747c26b.
This reverts commit e883ba93c4.
This reverts commit 7e87551c37.
This reverts commit 921274d2b8.
This reverts commit fc1f528e5e.
This reverts commit 0961715cda.
This reverts commit a93f264526.
This reverts commit 72dd94e1c6.
This reverts commit 29b2dc8964.
This reverts commit 05c7653bba.
This reverts commit 5190e5c260.
This reverts commit 6b55bf228c.
This reverts commit 184b4a12d3.
This reverts commit 4c31b7888a.
This reverts commit d44e9680f0.
This reverts commit 4069a5c43f.
2023-01-16 12:22:54 +01:00
Dmitry Stogov 889dba4016 Merge branch 'PHP-8.2'
* PHP-8.2:
  Revert "Merge branch 'PHP-8.0' into PHP-8.1"
2023-01-16 11:18:35 +03:00
Dmitry Stogov 4d8f409bfc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Revert "Merge branch 'PHP-8.0' into PHP-8.1"
2023-01-16 11:18:15 +03:00
Dmitry Stogov 0d011e4626 Revert "Merge branch 'PHP-8.0' into PHP-8.1"
This reverts commit 0116864cd3, reversing
changes made to 1f715f5658.
2023-01-16 11:15:30 +03:00
George Peter Banyard 334ecbed5e Update UPGRADING.INTERNALS with the changes made to php_url_encode_hash_ex() 2023-01-15 16:10:14 +00:00
George Peter Banyard 540e5104df Drop key_suffix parameter in php_url_encode_hash_ex()
The suffix was always constant and the same value between calls and depends on a prefix being needed
2023-01-15 16:00:18 +00:00
George Peter Banyard c9b8d1bfaa Use zend_string* instead of char* and size_t pair for key_prefix 2023-01-15 16:00:18 +00:00
George Peter Banyard 76eaff080a Use a zend_string* for arg_sep in php_url_encode_hash_ex()
This prevent a repeated strlen() call for known information
2023-01-15 16:00:18 +00:00
George Peter Banyard 098a43dbd0 Introduce new INI API to get zend_string* value for an INI setting 2023-01-15 16:00:18 +00:00
George Peter Banyard 20a6638e22 Extract scalar url encoding into its own function 2023-01-15 16:00:18 +00:00
George Peter Banyard 7d33a30b40 Handle floats directly in http_build_query() 2023-01-15 16:00:17 +00:00
George Peter Banyard ec7c7a7550 Add more tests for http_build_query()
Some with unusual types like resource and null
A lot more tests for objects
2023-01-15 16:00:17 +00:00
George Peter Banyard c177ea91d4 Move http_build_query() tests to the HTTP test folder 2023-01-15 16:00:17 +00:00
George Peter Banyard 5624cbbed1 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix wrong flags check for compression method in phar_object.c
  Fix missing check for xmlTextWriterEndElement
  Fix substr_replace with slots in repl_ht being UNDEF
2023-01-15 15:43:57 +00:00
George Peter Banyard ec377c687d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix wrong flags check for compression method in phar_object.c
  Fix missing check for xmlTextWriterEndElement
  Fix substr_replace with slots in repl_ht being UNDEF
2023-01-15 15:43:34 +00:00
Niels Dossche 347b7c3628 Fix wrong flags check for compression method in phar_object.c
I found this issue using static analysis tools, it reported that the condition was always false.
We can see that flags is assigned in the switch statement above, but a mistake was made in the comparison.

Closes GH-10328

Signed-off-by: George Peter Banyard <girgias@php.net>
2023-01-15 15:35:35 +00:00
Niels Dossche 11a1feb0d7 Fix missing check for xmlTextWriterEndElement
xmlTextWriterEndElement returns -1 if the call fails. There was already
a check for retval, but the return value wasn't assigned to retval. The
other caller of xmlTextWriterEndElement is in
xmlwriter_write_element_ns, which does the check correctly.

Closes GH-10324

Signed-off-by: George Peter Banyard <girgias@php.net>
2023-01-15 15:34:43 +00:00
Niels Dossche 4bbbe6d652 Fix substr_replace with slots in repl_ht being UNDEF
The check that was supposed to check whether the array slot was UNDEF
was wrong and never triggered. This resulted in a replacement with the
empty string or the wrong string instead of the correct one. The correct
check pattern can be observed higher up in the function's code.

Closes GH-10323

Signed-off-by: George Peter Banyard <girgias@php.net>
2023-01-15 15:31:34 +00:00
Max Kellermann 68ada76f9a Zend/zend_closures: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 45384c6e20 Zend/zend_inheritance: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann ef7fbfd710 Zend/zend_API: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 9b9ea0d7c6 Zend/zend_list: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann f15747c26b Zend/zend_objects: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann e883ba93c4 Zend/zend_gc: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 7e87551c37 Zend/zend_llist: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 921274d2b8 Zend/zend_observer: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann fc1f528e5e Zend/zend_interfaces: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 0961715cda Zend/zend_enum: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann a93f264526 Zend/zend_weakrefs: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 72dd94e1c6 Zend/zend_compile: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 29b2dc8964 Zend/zend_iterators: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 05c7653bba Zend/zend_call_stack: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 5190e5c260 Zend/zend_ast: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 6b55bf228c Zend/zend_language_scanner: include cleanup 2023-01-15 15:07:58 +00:00
Max Kellermann 184b4a12d3 main/php.h: add missing includes 2023-01-15 15:07:58 +00:00
Max Kellermann 4c31b7888a Zend/zend_globals_macros: add missing include for BEGIN_EXTERN_C 2023-01-15 15:07:58 +00:00
Max Kellermann d44e9680f0 ext/opcache/ZendAccelerator.h: add missing include for "INIT_FUNC_ARGS" 2023-01-15 15:07:58 +00:00
Max Kellermann 4069a5c43f Zend/zend_execute: always include zend_globals.h
Commit ecc880f491 was incomplete; EG() is used in inline functions
outside of ZEND_DEBUG.
2023-01-15 15:07:58 +00:00
Niels Dossche a60c6ee0ac Mark constant static arrays in function bodies actually as const (#10325) 2023-01-15 14:51:31 +00:00
Niels e951202a69 Remove useless check, search_str is always true here (#10322) 2023-01-15 00:32:51 +01:00
Jakub Zelenka abc41c2e00 Merge branch 'PHP-8.2' 2023-01-14 15:15:12 +00:00
Jakub Zelenka d0dd77a3c2 Merge branch 'PHP-8.1' into PHP-8.2 2023-01-14 15:14:44 +00:00
Jakub Zelenka 7d98e3e40c Fix missing comment in FPM www.conf.in 2023-01-14 15:13:55 +00:00
Arnaud Le Blanc a493da7b9d Fix typo in HAVE_ macro (#10310) 2023-01-14 13:43:26 +01:00
Arnaud Le Blanc 2a5c03cd72 [ci skip] NEWS 2023-01-14 12:19:58 +01:00
Niels 6ab503814d Make array_pad's $length warning less confusing (#10149)
Remove array_pad's arbitrary length restriction

The error message was wrong; it *is* possible to use a larger length.
Furthermore, there is an arbitrary restriction on the new array's
length.

Fix both by checking the length against HT_MAX_SIZE.
2023-01-14 12:15:56 +01:00
David CARLIER 690db97c6d intl extension couple of micro optimisations for error edge cases. (#10044)
making c++ compile time few enums ranges.
2023-01-14 07:26:05 +00:00
Arnaud Le Blanc 9788244a42 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix run-tests.php hanging when a worker process dies without notice (#9931)
2023-01-13 18:07:58 +01:00
Arnaud Le Blanc 61048f984a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix run-tests.php hanging when a worker process dies without notice (#9931)
2023-01-13 18:07:45 +01:00
Arnaud Le Blanc 8c0698f66b Fix run-tests.php hanging when a worker process dies without notice (#9931)
run-tests.php with `-jN` can hang if a parallel worker dies without notice. This
can happen due to fatal errors in the worker, or if the worker is killed.

- run-tests.php (main process)
  \_ run-tests.php (worker #0) // main process hangs if this one crashes
     \_ test-001.php (test-001.phpt)
2023-01-13 17:43:17 +01:00