1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Commit Graph

123446 Commits

Author SHA1 Message Date
George Peter Banyard 8a86fe11da Add missing break; in Zlib extension 2021-04-07 00:46:17 +01:00
Derick Rethans 4e3d469c4a Skip test on 32bit, as the timestamp range is outside 32bit range 2021-04-06 23:54:51 +01:00
Anatol Belski 7251f3900e fileinfo: Update the patch
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-06 22:43:05 +02:00
Derick Rethans a6702348cd Merge branch 'timelib-and-date-time-fixes' 2021-04-06 20:50:58 +01:00
Derick Rethans 091c0920b9 Upgrade timelib to 2021.03 and fix many date/time issues 2021-04-06 20:50:32 +01:00
Dmitry Stogov ffb1dd0839 Use zend_hash_append*() in zend_fetch_debug_backtrace() 2021-04-06 18:25:50 +03:00
Dmitry Stogov a13a1be734 Use ZEND_HASH_FILL_* API for explode() 2021-04-06 16:57:02 +03:00
Dmitry Stogov e86bea8d45 Extend ZEND_HASH_FILL_* API with ZEND_HASH_FILL_GROW and use it to optimize get_declared_classes() 2021-04-06 16:18:47 +03:00
Nikita Popov e10a7107a5 Make tokenizer_data_gen.php compatible with older PHP
Our PHP requirement is currently PHP 7.1, so don't use flexible
heredoc.
2021-04-06 15:13:21 +02:00
Christoph M. Becker 67e545f1bb Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix #80880: SSL_read on shutdown, ftp/proc_open
2021-04-06 14:08:54 +02:00
Christoph M. Becker de9734a5bb Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #80880: SSL_read on shutdown, ftp/proc_open
2021-04-06 14:07:25 +02:00
Christoph M. Becker 9688071679 Fix #80880: SSL_read on shutdown, ftp/proc_open
When `SSL_read()` after `SSL_shutdown()` fails with `SSL_ERROR_SYSCALL`,
we should not warn about this, because it is likely caused by the peer
having closed the connection without having sent a close_notify
shutdown alert.

Signed-off-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-6803.
2021-04-06 14:03:19 +02:00
Anatol Belski ecfb888354 fileinfo: Turn back the WS check mitigation
Looks like there's still a timing issue shown on some pipeline runs.

Signed-off-by: Anatol Belski <ab@php.net>
2021-04-06 12:29:04 +02:00
Nikita Popov 57eb29f1d3 Update zend_vm_gen.php with zend_vm_opcode.c/h changes
The generated files were modified directly, resulting in mysterious
build failures depending on exact build order.
2021-04-06 11:35:05 +02:00
Nikita Popov 7a306c0813 Fix skipif section in test
This was migrated to --EXTENSIONS--.
2021-04-06 09:58:49 +02:00
twosee fc64a7bef4 Ignore some opcodes in JIT check
Some user opcode handler actually gets called when JIT is used, so do not disable JIT even if these user opcode handlers were registered, just ignore them.

ZEND_EXIT can help Swoole to detect exit/die operation and exit from the current coroutine and record exit_status correctly.
ZEND_*_SILENCE can help Swoole to switch EG(error_reporting) to keep the right behavior when using the error control operator.
So we ignore ZEND_EXIT, ZEND_BEGIN_SILENCE, ZEND_END_SILENCE in JIT check here.

Closes GH-6640.
2021-04-06 11:58:20 +08:00
twosee cb8f39f247 Add zend_get_opcode_id() to get opcode id from name 2021-04-06 11:44:10 +08:00
Anatol Belski 4af6679d78 fileinfo: Update libmagic.patch
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-05 22:41:00 +02:00
Anatol Belski f60dc3bd34 fileinfo: More VS compat
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-05 21:23:26 +02:00
Nikita Popov 61f4525c2b Merge branch 'PHP-8.0'
* PHP-8.0:
  .gdbinit: make zbacktrace show the correct stack when switching threads
2021-04-05 21:12:11 +02:00
Nikita Popov 304190c49d Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  .gdbinit: make zbacktrace show the correct stack when switching threads
2021-04-05 21:11:19 +02:00
Dylan K. Taylor 50f476591f .gdbinit: make zbacktrace show the correct stack when switching threads
I found this mainly to be a problem when working with threading
extensions. zbacktrace doesn't show the correct stack when switching
threads.

Closes GH-6814.
2021-04-05 21:10:52 +02:00
Anatol Belski cd238bd09d fileinfo: Fix VS compat
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-05 21:10:20 +02:00
Anatol Belski f7ab54cbe7 fileinfo: Restore config.h for libmagic
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-05 20:56:41 +02:00
Anatol Belski 3b9173dc8f fileinfo: Port libmagic 5.40
Signed-off-by: Anatol Belski <ab@php.net>
2021-04-05 20:19:07 +02:00
Dmitry Stogov 22019a1edd Fixed unintended string duplication 2021-04-05 17:55:42 +03:00
Dmitry Stogov 9e12dbbaf2 micro-optimization 2021-04-05 16:11:24 +03:00
Dmitry Stogov 368766ec28 Set expectations 2021-04-05 15:21:13 +03:00
George Peter Banyard 705e93a22f Fix necessary extensions list for OPcache test 2021-04-05 06:34:13 +01:00
Max Semenik e9f783fcdd Migrate skip checks to --EXTENSIONS--, p3
For rationale, see #6787

Extensions migrated in part 3:
* ftp
* gmp
* iconv
* opcache
* shmop
2021-04-03 15:23:25 +02:00
Dmitry Stogov 33f938bad0 Fixed macros 2021-04-02 19:22:30 +03:00
Dmitry Stogov 46865392fe Attempt to fix ext/spl/tests/bug67359.phpt broken by f323baa845 2021-04-02 19:09:29 +03:00
Joe Watkins 92665cdcbb update release process doc (#6829) 2021-04-02 17:13:00 +02:00
Dmitry Stogov 93430e2b14 clear only neccessary part of spl_filesystem_object 2021-04-02 17:51:18 +03:00
Dmitry Stogov 758ca0198e We don't have to clear zend_object structure, it's initialized by zend_object_std_init() anyway. 2021-04-02 16:11:34 +03:00
Dmitry Stogov f323baa845 Reduce number of stat() calls 2021-04-02 13:39:12 +03:00
Dmitry Stogov c2fc25fdf2 Avoid reading of property name in ASSIGN_OBJ if it can be accessed through run-time cache slot. 2021-04-01 17:55:49 +03:00
Dmitry Stogov 1b94b5b61c Avoid reading of property name in FETCH_OBJ_R/IS if it can be accessed through run-time cache slot. 2021-04-01 16:18:05 +03:00
Max Semenik bd9f4fa676 Migrate skip checks to --EXTENSIONS--, p2
For rationale, see https://github.com/php/php-src/pull/6787

Make extension checks lowercase, add a special case for opcache
that has internal name not matching .so filename.

Extensions migrated in part 2:
* dom
* exif
* fileinfo
* ffi
2021-04-01 12:08:24 +01:00
Mike Pall 83b01a920e DynASM: Fix global label references
ARM64 patch contributed by Hao Sun and Nick Gasson.
2021-03-31 23:55:36 +03:00
Mike Pall 0b4f83f68f DynASM/ARM64: Add VREG support.
Contributed by Hao Sun and Nick Gasson.
2021-03-31 23:54:22 +03:00
Dmitry Stogov b428c51aea Merge upstream DynAsm changes from LuaJIT 2021-03-31 23:51:19 +03:00
Dmitry Stogov 24388fd573 Merge branch 'PHP-8.0'
* PHP-8.0:
  Changed PowerPC CPU registers used by Zend VM to work around GCC bug.
2021-03-31 13:12:00 +03:00
Dmitry Stogov e0996decc3 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Changed PowerPC CPU registers used by Zend VM to work around GCC bug.
2021-03-31 13:11:11 +03:00
Dmitry Stogov 39d8fc1edc Changed PowerPC CPU registers used by Zend VM to work around GCC bug.
Old registers (r28/r29) might be clobbered by _restgpr routine used for return from C function compiled with -Os.
2021-03-31 13:10:21 +03:00
Dmitry Stogov a6dd92f820 Remove reference to $GLOBALS. We don't create an actual variable for $GLOBALS any more . 2021-03-31 12:28:23 +03:00
Dmitry Stogov 84a843dff6 Use better function 2021-03-30 20:20:54 +03:00
Dmitry Stogov 8c001d5ba3 We don't create an actual variable for $GLOBALS any more. 2021-03-30 15:12:10 +03:00
Christoph M. Becker 90da9bf53b Merge branch 'PHP-8.0'
* PHP-8.0:
  Handle reference zvals when outputting superglobals in phpinfo()

Signed-off-by: Christoph M. Becker <cmbecker69@gmx.de>
2021-03-30 13:55:36 +02:00
Christoph M. Becker 443478109b Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Handle reference zvals when outputting superglobals in phpinfo()

Signed-off-by: Christoph M. Becker <cmbecker69@gmx.de>
2021-03-30 13:52:38 +02:00