fix phpdbg's -h switch

The help functionality needs a correct stdout fd, so pre setup it
for the only case.

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index a66576c61e8f4bbe7772372d597be6c7450c7753..c3f0cc6c547dbeec34f9d5e7a78674f29a8b7607 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1500,6 +1500,10 @@ phpdbg_main:
                                sapi_startup(phpdbg);
                                phpdbg->startup(phpdbg);
                                PHPDBG_G(flags) = 0;
+                               /* It ain't gonna proceed to real execution anyway,
+                                       but the correct descriptor is needed already. */
+                               PHPDBG_G(io)[PHPDBG_STDOUT].ptr = stdout;
+                               PHPDBG_G(io)[PHPDBG_STDOUT].fd = fileno(stdout);
                                phpdbg_set_prompt(PHPDBG_DEFAULT_PROMPT);
                                phpdbg_do_help(NULL);
                                sapi_deactivate();