diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-19 09:55:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-19 09:55:42 +0100 |
| commit | 20c261b2fecd6b29e002de89d9171268bf6930e5 (patch) | |
| tree | 0640b3f7ebe710ce835862d45f93855f42223f66 | |
| parent | 5ead86a35e21eff9504d1a52f4b2641817d1a781 (diff) | |
| parent | 09e522322af7268f53d340cbff3d109fab058539 (diff) | |
| download | php-git-20c261b2fecd6b29e002de89d9171268bf6930e5.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_help.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -44,6 +44,10 @@ PHP NEWS - Phar: . Fxied bug #77697 (Crash on Big_Endian platform). (Laruence) +- phpdbg: + . Fixed bug #77767 (phpdbg break cmd aliases listed in help do not match + actual aliases). (Miriam Lauter) + - sodium: . Fixed bug #77646 (sign_detached() strings not terminated). (Frank) diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index e9caa18895..b328906d3c 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -544,8 +544,8 @@ phpdbg_help_text_t phpdbg_help_text[] = { "types:" CR CR " **Target** **Alias** **Purpose**" CR -" **at** **A** specify breakpoint by location and condition" CR -" **del** **d** delete breakpoint by breakpoint identifier number" CR CR +" **at** **@** specify breakpoint by location and condition" CR +" **del** **~** delete breakpoint by breakpoint identifier number" CR CR "**Break at** takes two arguments. The first is any valid target. The second " "is a valid PHP expression which will trigger the break in " |