c4a6998c62
Merge branch 'PHP-7.4'
2019-07-16 17:45:03 +02:00
b317f0eb59
Remove ZEND_HANDLE_MAPPED
...
The buf/len members are now simply used in addition to the main
stream, without changing the handle kind.
2019-07-16 17:44:32 +02:00
e0eca26285
Drop free_filename field from zend_file_handle
...
free_filename was always zero.
2019-07-16 17:07:26 +02:00
c562d71d12
Merge branch 'PHP-7.4'
2019-07-16 11:11:08 +02:00
ebfa05677b
Merge branch 'PHP-7.3' into PHP-7.4
2019-07-16 11:11:00 +02:00
eea9d61763
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-16 11:10:51 +02:00
8a19fe29de
Fixed bug #78297
2019-07-16 11:09:17 +02:00
9207aef60c
Merge branch 'PHP-7.4'
2019-07-15 16:26:25 +02:00
c5f1b384b5
Move shebang handling into the lexer
...
Instead of handling shebang lines by adjusting the file pointer in
individual SAPIs, move the handling into the lexer, where this is
both a lot simpler and more robust. Whether the shebang should be
skipped is controlled by CG(skip_shebang) -- we might want to do
that in more cases.
This fixed bugs #60677 and #78066 .
2019-07-15 16:25:49 +02:00
fe2aca83ce
Merge branch 'PHP-7.4'
2019-07-01 16:14:58 +02:00
af3e2d3186
Initialize last_line in phpdbg globals
2019-07-01 16:14:45 +02:00
8f0729cb65
Merge branch 'PHP-7.4'
2019-06-28 17:47:45 +02:00
45ab57339e
Use strcmp() in phpdbg_eol_global_update
...
memcmp() only makes sense on equal length strings, and here we don't
know anything about the length of the input.
2019-06-28 17:24:30 +02:00
cf29c0f212
Remove phpdbg_xml_asprintf()
...
Clang doesn't like the use of promoted zend_bool in va_start. As
the function isn't used anyway, I'm simply dropping it...
2019-06-28 16:59:52 +02:00
b98c148f78
Merge branch 'PHP-7.4'
2019-06-28 15:05:00 +02:00
54dd762f59
Set up asan+ubsan scheduled build on azure
...
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.
I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
2019-06-28 15:00:54 +02:00
0a0ca984f0
Merge branch 'PHP-7.4'
2019-06-28 14:48:08 +02:00
50cce5eb4f
Avoid reliance on arena details on phpdbg oplog
...
Instead of guessing what the address of the first arena allocation
is going to be, embed the sentinel in the oplog_list structure
directly.
2019-06-28 14:47:42 +02:00
b98cd0719a
Merge branch 'PHP-7.4'
...
* PHP-7.4:
implement tsrm_is_shutdown API
2019-06-28 10:27:39 +02:00
68485f8ab4
implement tsrm_is_shutdown API
2019-06-28 10:27:19 +02:00
0504f04591
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Use the portable zend_strndup() instead of strndup()
2019-06-28 10:24:15 +02:00
bc0db8ce45
Use the portable zend_strndup() instead of strndup()
2019-06-28 10:23:38 +02:00
aa8d70f309
Merge branch 'PHP-7.4'
2019-06-28 09:19:49 +02:00
8c4d199851
Fix init_file leak in phpdbg
2019-06-28 09:17:26 +02:00
5918171f95
Merge branch 'PHP-7.4'
2019-06-27 14:21:49 +02:00
c3132781ec
Fix phpdbg shutdown order
...
In particular, make sure that everything using zmm is released
before zmm is shut down. phpdbg currently gets away with this,
because either a) its custom handlers are used and no auto-free
happens or b) the system allocator is used and no auto-free happens.
With the tracking allocator for asan this no longer works.
2019-06-27 14:20:51 +02:00
2149ed7072
Don't use zmm for PHPDBG_G(exec)
...
Uses system allocator when backing up settings ... let's avoid
unnecessary confusion.
2019-06-27 14:20:30 +02:00
a1479fbbd9
Merge branch 'PHP-7.4'
2019-06-25 14:30:24 +02:00
42b22d3a94
Fix out of bounds write in phpdbg
...
It seems that this code has a peculiar interpretation of "len",
where it actually points to the last character, not one past it.
So we need +1 here for that extra char and another +1 for the
terminating null byte.
2019-06-25 14:28:58 +02:00
e4371ef158
Merge branch 'PHP-7.4'
2019-06-21 17:01:47 +02:00
152ccfb08d
Fix stack leak in phpdbg
2019-06-21 17:01:25 +02:00
a7bcfee9c9
Fix prompt leak in phpdbg
2019-06-21 17:01:18 +02:00
646b64b119
Fix skipif syntax errors
...
Apparently I did this only on masster...
2019-06-14 09:29:14 +02:00
61f78de486
Constify some char* arguments or return values of ZEND_API
...
Closes GH-4247.
2019-06-12 16:49:32 +02:00
eabb8a6324
Skip syntax errors in skipif conditions
2019-06-12 15:56:38 +02:00
9fa009c86d
Merge branch 'PHP-7.4'
2019-06-12 09:29:06 +02:00
852ab5d83f
Use %define api.pure instead of %pure-parser
...
%pure-parser is deprecated. In our case there is no difference between
true & full, as we don't use locations.
2019-06-12 09:26:34 +02:00
e4fae9c061
Merge branch 'PHP-7.4'
2019-06-11 13:16:38 +02:00
89b2d88659
Register class before fetching parent
...
We want the class declaration to be available while compiling the
parent class.
2019-06-11 13:09:33 +02:00
8f93beb06e
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
2019-06-11 12:55:38 +02:00
9ecc0a4f29
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
2019-06-11 12:55:28 +02:00
7361701351
Merge branch 'PHP-7.4'
...
* PHP-7.4:
watchpoints have flaws in implementation
2019-06-10 14:23:55 +02:00
1e5004060e
watchpoints have flaws in implementation
2019-06-10 14:23:37 +02:00
d154301866
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-04 16:27:57 +02:00
a3e6b50442
Fixed bug #78050
...
This is a backport of a982125561
2019-06-04 16:26:34 +02:00
f721f2fa12
Merge branch 'PHP-7.4'
2019-06-04 15:09:01 +02:00
a982125561
Try to fix phpdbg + opcache compatibility
2019-06-04 15:08:55 +02:00
693955c5c5
Merge branch 'PHP-7.4'
2019-05-29 17:07:52 +02:00
3ba64545ed
Update phpdbg oplog test
2019-05-29 17:05:01 +02:00
3518c4dfe9
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Revert "Rename *.l files to *.re"
2019-05-20 06:07:03 +02:00
Nikita Popov