php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
123,439 Commits 547 Branches 1,483 Tags
e86bea8d45e04c71c7f93bf475ec528b44866857
Commit Graph

123439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rowan Tommins
206fd35a98 Handle reference zvals when outputting superglobals in phpinfo() 
Fixes <https://bugs.php.net/80915>.

Closes GH-80915.

Signed-off-by: Christoph M. Becker <cmbecker69@gmx.de>
 2021-03-30 13:49:22 +02:00
Dmitry Stogov
849ae12e7a Simplify auto-globals checks 2021-03-30 13:56:29 +03:00
Nikita Popov
fba8b955e9 Fix incorrect prop_name release 
After 2c4346f9de the property
name should no longer be released.

This should fix the preloading failure under asan.
 2021-03-30 12:53:09 +02:00
Nikita Popov
202a701a4e Merge branch 'PHP-8.0' 
* PHP-8.0:
  Remove zero size special case for copy_to_stream
 2021-03-29 15:22:50 +02:00
Nikita Popov
b95b553489 Remove zero size special case for copy_to_stream 
This doesn't seem to serve a purpose anymore. Stats are expensive,
so doing an unnecessary stat just to short-circuit the zero size
case is rather dubious. It can also break with stream wrappers
that return inaccurate sizes (symfony/symfony#40574) and probably
can also break with stream filters.

Drop the special case and adjust code to make it more obvious that
it will still be handled correctly.

Closes GH-6807.
 2021-03-29 15:21:59 +02:00
George Peter Banyard
8560d168d3 Align types with the output of zend_hash_num_elements() 2021-03-29 14:20:22 +01:00
George Peter Banyard
caaf2e9981 [skip-ci] Update UPGRADING documents for the new argument for fputcsv() 2021-03-29 13:55:18 +01:00