Dmitry Stogov
1f800e2f82
Removed die('skip wurstuoppe');
2019-07-05 12:20:12 +03:00
Dmitry Stogov
1b5b8175af
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP
2019-07-05 12:16:30 +03:00
Dmitry Stogov
48ca5a1e17
Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP
2019-07-05 12:03:25 +03:00
Nikita Popov
215e9d069c
Merge branch 'PHP-7.4'
2019-07-05 11:00:54 +02:00
Nikita Popov
24ecfcc833
Add test
...
Forgot to commit this.
2019-07-05 11:00:27 +02:00
Nikita Popov
f8d8b96e92
Merge branch 'PHP-7.4'
2019-07-05 10:47:01 +02:00
Nikita Popov
ea43624972
Fix wrong size calculation related to function name
...
It would be nice if we could drop this manual function name reuse
code altogether and rely on interning for it.
2019-07-05 10:46:41 +02:00
Nikita Popov
d3c4841b18
Preloading: Don't move conditional functions to back to scripts
...
Conditional function declaration may be referenced by functions or
classes that have been preloaded, so we should not move them back
to scripts.
What we probably should be doing though is to discard conditional
functions that are not used in the optimizer. This is probably
reasonably common for polyfills, where we will be able to const-eval
the conditions and drop the BBs declaring the functions, but won't
delete the function declarations themselves.
2019-07-05 10:46:41 +02:00
George Wang
dfce767a62
Merge branch 'PHP-7.4'
2019-07-04 12:15:25 -04:00
George Wang
6a403504e7
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-04 12:14:48 -04:00
George Wang
3ec8776940
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-04 12:04:08 -04:00
George Wang
32af676bd9
Updated to LiteSpeed SAPI V7.4.3
...
Increased response header count limit from 100 to 1000.
Added crash handler to cleanly shutdown PHP request.
Added CloudLinux mod_lsapi mode
Fixed bug #76058
2019-07-04 12:03:21 -04:00
Nikita Popov
9fbf9e3e13
Merge branch 'PHP-7.4'
2019-07-04 17:13:04 +02:00
Nikita Popov
a0e7624059
Compact literals: Don't insert unmergeable keys
...
LITERAL_VALUE with related literals cannot be merged, avoid inserting
them in the literals hash in the first place. Otherwise we may end up
inserting the same key multiple times. We may also miss merging
opportunities due to the duplicate keys.
2019-07-04 17:12:55 +02:00
Nikita Popov
6a9127c100
Assert that HT entries using add_new APIs are really new
2019-07-04 17:12:55 +02:00
Dmitry Stogov
806e38a3a4
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Improve zend_binary_assign_op helpers. Reorder opcode numbers to make ADD-POW and ASSIGN_ADD-ASSIGN_POW opcodes sequencional.
2019-07-04 17:37:52 +03:00
Dmitry Stogov
ef05eab432
Improve zend_binary_assign_op helpers.
...
Reorder opcode numbers to make ADD-POW and ASSIGN_ADD-ASSIGN_POW opcodes sequencional.
2019-07-04 17:25:43 +03:00
Dmitry Stogov
9161247140
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Introduce and use ZEND_VM_INLINE_HANDLER() to avoid ZEND_RETURN exception
2019-07-04 15:55:33 +03:00
Dmitry Stogov
925fd0fe6f
Introduce and use ZEND_VM_INLINE_HANDLER() to avoid ZEND_RETURN exception
2019-07-04 15:54:45 +03:00
Christoph M. Becker
4ed87f379b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
[ci skip] Remove NEWS entry
2019-07-04 14:51:15 +02:00
Christoph M. Becker
27e1a95098
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
[ci skip] Remove NEWS entry
2019-07-04 14:50:51 +02:00
Christoph M. Becker
807c755670
[ci skip] Remove NEWS entry
...
This commit already was contained in PHP 7.3.7, but doesn't need a NEWS
entry, since the regression had only been introduced with PHP 7.3.7RC1.
2019-07-04 14:50:23 +02:00
Christoph M. Becker
143f32cf25
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix typo in NEWS [skip ci]
2019-07-04 14:45:13 +02:00
Christoph M. Becker
976a323ab8
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix typo in NEWS [skip ci]
2019-07-04 14:44:38 +02:00
Fabien Villepinte
cb1237a3ed
Fix typo in NEWS [skip ci]
2019-07-04 14:43:45 +02:00
Nikita Popov
8c647946ff
Merge branch 'PHP-7.4'
2019-07-04 12:20:40 +02:00
Nikita Popov
b250f89b92
Preloading: Relax known type restrictions
...
Check whether there is a parent/interface/trait method with the same
name and only then require the type to be known. This reduces the
number of cases where this triggers in practice a lot.
2019-07-04 12:20:32 +02:00
Nikita Popov
4a2646cf45
Preloading: Also handle trait methods outside main script
2019-07-04 12:20:31 +02:00
Dmitry Stogov
f5869118a9
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Split destructor
2019-07-04 13:08:08 +03:00
Dmitry Stogov
e3d35b6434
Split destructor
2019-07-04 13:07:47 +03:00
Nikita Popov
6473ec30a1
Merge branch 'PHP-7.4'
2019-07-04 11:07:14 +02:00
Nikita Popov
df243f19be
Preloading: Prevent autoloading while resolving constants
2019-07-04 11:05:01 +02:00
Nikita Popov
21b0f44429
Merge branch 'PHP-7.4'
2019-07-04 10:32:48 +02:00
Nikita Popov
1fea887cc0
Set PROPERTY_TYPES_RESOLVED flag for internal classes
...
Also make sure that the resolution happens before preloading runs.
2019-07-04 10:32:36 +02:00
Nikita Popov
c581b2f5b0
Fix ZTS flag on master
2019-07-04 09:53:51 +02:00
Dmitry Stogov
c98b6d5bb5
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Better optimization in RELEASE build. ZEND_ASSERT(s) prevented optimization
2019-07-03 20:24:26 +03:00
Dmitry Stogov
09041151de
Better optimization in RELEASE build. ZEND_ASSERT(s) prevented optimization
2019-07-03 20:19:56 +03:00
Joe Watkins
f1f63c0cec
Merge branch 'PHP-7.4'
...
* PHP-7.4:
improvements to cli server
2019-07-03 16:31:55 +02:00
Joe Watkins
87249091d5
Merge branch 'php-cli-server-improvements' into PHP-7.4
...
* php-cli-server-improvements:
improvements to cli server
2019-07-03 16:31:40 +02:00
Joe Watkins
30019f47a5
improvements to cli server
2019-07-03 16:30:51 +02:00
Nikita Popov
f124bf22e0
Merge branch 'PHP-7.4'
2019-07-03 14:05:31 +02:00
Nikita Popov
f857648270
Improve unlinked class diagnostics during preloading
2019-07-03 14:05:10 +02:00
Nikita Popov
057012f241
Merge branch 'PHP-7.4'
2019-07-03 12:48:00 +02:00
Nikita Popov
d6d9024cb8
Avoid use of random ports in some socket tests
2019-07-03 12:47:49 +02:00
Nikita Popov
97b84a3694
Merge branch 'PHP-7.4'
2019-07-03 12:37:17 +02:00
Nikita Popov
a023eb3967
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-03 12:37:12 +02:00
Nikita Popov
af3c854074
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-03 12:36:50 +02:00
Nikita Popov
0e48e35e04
Fixed bug #78231
2019-07-03 12:36:06 +02:00
Nikita Popov
f6f0d383b3
Merge branch 'PHP-7.4'
2019-07-03 11:42:04 +02:00
Nikita Popov
959c84b249
Remove curl_basic_017.phpt
...
The output of the three handles may be interleaved. We already have
curl_basic_018.phpt which uses curl_multi_getcontent() and thus
has predictable output. As such, I'm dropping this test altogether.
2019-07-03 11:38:24 +02:00