]> granicus.if.org Git - php/commitdiff
Do not display compilation success / normal script end in -rr mode
authorBob Weinand <bobwei9@hotmail.com>
Sat, 18 Jul 2015 18:37:44 +0000 (20:37 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 20 Jul 2015 16:00:42 +0000 (18:00 +0200)
sapi/phpdbg/phpdbg.c

index 48ac68c7f4b100b49029ef664f7f61c741bc0853..3fa69cfe622e98502e7d116d3fd8cd878fbc9910 100644 (file)
@@ -1475,7 +1475,7 @@ phpdbg_main:
                /* setup remote server if necessary */
                if (cleaning <= 0 && listen > 0) {
                        server = phpdbg_open_socket(address, listen);
-                               if (-1 > server || phpdbg_remote_init(address, listen, server, &socket, &stream) == FAILURE) {
+                       if (-1 > server || phpdbg_remote_init(address, listen, server, &socket, &stream) == FAILURE) {
                                exit(0);
                        }
 
@@ -1656,7 +1656,7 @@ phpdbg_main:
 
                /* auto compile */
                if (PHPDBG_G(exec)) {
-                       if (settings) {
+                       if (settings || phpdbg_startup_run > 0) {
                                PHPDBG_G(flags) |= PHPDBG_DISCARD_OUTPUT;
                        }
 
@@ -1814,7 +1814,7 @@ phpdbg_out:
                        php_request_shutdown(NULL);
                } zend_end_try();
 
-               if ((PHPDBG_G(flags) & (PHPDBG_IS_QUITTING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_RUNNING) {
+               if ((PHPDBG_G(flags) & (PHPDBG_IS_QUITTING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_RUNNING && !quit_immediately) {
                        phpdbg_notice("stop", "type=\"normal\"", "Script ended normally");
                        cleaning++;
                }