Commit graph

85 commits

Author SHA1 Message Date
Nikita Popov
f5dbebd82e Accept zend_string instead of zval in zend_compile_string 2020-09-07 11:42:21 +02:00
Nikita Popov
c439f1fa6a Fixed bug #62294
The primary issue was already resolved in 7c3e487289,
but the particular example used in this bug report ran into an
additional issue on PHP 8, because I forgot to drop a number of
zend_bailout calls when switch require failure to throw.
2020-08-10 12:54:02 +02:00
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers
Closes GH-4732.
2019-09-25 14:51:43 +02:00
Nikita Popov
173ebe4c44 Merge branch 'PHP-7.4' 2019-07-24 10:44:40 +02:00
Nikita Popov
d9680272c7 Revert "Drop free_filename field from zend_file_handle"
This reverts commit e0eca26285.

free_filename is used by the wincache extension, restore this
field for PHP 7.4.
2019-07-24 10:43:37 +02:00
Nikita Popov
c4a6998c62 Merge branch 'PHP-7.4' 2019-07-16 17:45:03 +02:00
Nikita Popov
e0eca26285 Drop free_filename field from zend_file_handle
free_filename was always zero.
2019-07-16 17:07:26 +02:00
Nikita Popov
c562d71d12 Merge branch 'PHP-7.4' 2019-07-16 11:11:08 +02:00
Nikita Popov
ebfa05677b Merge branch 'PHP-7.3' into PHP-7.4 2019-07-16 11:11:00 +02:00
Nikita Popov
8a19fe29de Fixed bug #78297 2019-07-16 11:09:17 +02:00
twosee
61f78de486 Constify some char* arguments or return values of ZEND_API
Closes GH-4247.
2019-06-12 16:49:32 +02:00
Nikita Popov
a3e6b50442 Fixed bug #78050
This is a backport of a982125561.
2019-06-04 16:26:34 +02:00
Nikita Popov
a982125561 Try to fix phpdbg + opcache compatibility 2019-06-04 15:08:55 +02:00
Matteo Beccati
15ff5db6b9 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Ref #76801 remove old file source from file_sources hash in case of file included more than once
2019-04-03 14:36:20 +02:00
Alessandro Chitolina
4029c0b6a2 Ref #76801 remove old file source from file_sources hash in case of file included more than once 2019-04-03 14:35:57 +02:00
Joe Watkins
994a897586
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  fix bug #76801: phpdbg too many open files error
2019-03-23 09:49:28 +01:00
Alessandro Chitolina
b8b880932e
fix bug #76801: phpdbg too many open files error 2019-03-23 09:47:49 +01:00
Zeev Suraski
0cf7de1c70 Remove yearly range from copyright notice 2019-01-30 11:03:12 +02:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Anatol Belski
afb6ca2566 Finish remaining replacement uint => uint32_t
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
Bob Weinand
728502fc29 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 00:40:54 +01:00
Bob Weinand
3b2b080cbc Fixed bug #73704 (phpdbg shows the wrong line in files with shebang) 2016-12-22 00:39:24 +01:00
Bob Weinand
43f88f25bb Merge branch 'PHP-7.0' into PHP-7.1 2016-12-06 18:30:37 +01:00
Bob Weinand
7e12b5da71 Fixed issue getting executable lines from custom wrappers
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +01:00
Bob Weinand
386aff451b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-14 12:25:16 +02:00
Bob Weinand
466870e2b0 Fix memory leak when compiling files in phpdbg 2016-10-14 12:24:28 +02:00
Bob Weinand
11e7447e04 Merge branch 'PHP-7.0' into PHP-7.1
(cherry picked from commit 37ae5f3931)
2016-10-14 01:48:03 +02:00
Bob Weinand
5aae01104f Add stdin command and -s command line parameter to phpdbg
This allows reading the initial script file from stdin instead of being forced to put the script into a file in order to run it with phpdbg.
Especially important for programmatic execution of phpdbg.

Also adding tests/include_once.phpt and tests/set_exception_handler.phpt as I seem to have forgotten to git add them sometime long ago...
2016-10-12 20:15:49 +02:00
Bob Weinand
c9d3b9fb47 Use better fix for preventing too early freeing of interned strings
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle
2016-10-06 10:36:25 +02:00
Bob Weinand
abfd811ea4 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-05 12:20:06 +02:00
Bob Weinand
eaff72f31b Remove phpdbg fix targeting 7.1 which landed in 7.0 2016-10-05 12:08:20 +02:00
Bob Weinand
a5129bcb5b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-01 10:47:31 +01:00
Bob Weinand
3280a29ee5 Fix invalid access to interned strings after they are freed in phpdbg 2016-10-01 10:46:21 +01:00
Bob Weinand
b00376884e Rewrite watchpoints to be much more stable
This mainly involves a separate abstraction layer for elements (e.g. $a->b) and watchpoints (on pointer of the Bucket for example).
Also better comparison handling (value backup vs. page dumps).

It is not yet finished (there are sometimes false positives announced and names not yet perfect), but the functionality is working and not crashing as far as I have tested.
Future scope is also relative watchpoints, e.g. "w $this->val expression()" which does not have the symbol tables as basis, but the value (in this example: return value of expression()) as basis.
2016-07-11 23:58:20 +02:00
Bob Weinand
67468fb417 Fixed bug #72284 (phpdbg fatal errors with coverage)
Cherry-pick of original commits d3371b and 0f20e11 only present in master
2016-05-30 13:31:17 +02:00
Bob Weinand
d33e71b358 Fix include_once in phpdbg 2016-05-07 14:45:41 +02:00
Bob Weinand
0f20e113c2 Fix potential double free with phpdbg 2016-05-03 13:36:41 +02:00
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
2016-04-28 04:13:34 +03:00
Joe Watkins
b04125da85 phpdbg: close file handles 2016-04-12 13:40:03 +01:00
James Titcumb
c4b188871e Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Dmitry Stogov
3c5a3e77d4 Fixed incomplete initialization. 2015-10-30 07:15:56 +03:00
Bob Weinand
84b608de10 Fix valgrind warning upon displaying lines from eval()ed code in phpdbg 2015-08-31 23:42:15 +02:00
Xinchen Hui
c359ca8c3d Fixed printing 2015-08-27 11:38:11 +08:00
Anatol Belski
7366e29662 fix build, use exported symbol 2015-08-25 10:39:43 +02:00
Bob Weinand
6b3228fda4 Fix oplog with eval()ed code 2015-08-24 12:28:35 +01:00
Bob Weinand
d0ad621906 Fix further leaks 2015-08-04 01:22:04 +02:00