Merge branch 'PHP-7.0' into PHP-7.1

diff --cc sapi/phpdbg/phpdbg.c
index 0e891f3869969853d59eb38d37854a11c4a0b573,618a72f4294f44814a985e2c452103e15174b9a2..5a1bd3a6b4ed04d0635047949bbc06344e87d0e5
--- 1/sapi/phpdbg/phpdbg.c
--- 2/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@@ -2030,8 -2026,20 +2043,11 @@@ phpdbg_out
                        if (PHPDBG_G(prompt)[1]) {
                                free(PHPDBG_G(prompt)[1]);
                        }
+                       if (PHPDBG_G(cur_command)) {
+                               free(PHPDBG_G(cur_command));
+                       }
                }
  
 -              /* hack to restore mm_heap->use_custom_heap in order to receive memory leak info */
 -              if (use_mm_wrappers) {
 -                      /* ASSUMING that mm_heap->use_custom_heap is the first element of the struct ... */
 -                      *(int *) mm_heap = 0;
 -              }
 -              zend_try {
 -                      php_request_shutdown(NULL);
 -              } zend_end_try();
 -
                if (exit_status == 0) {
                        exit_status = EG(exit_status);
                }

diff --cc sapi/phpdbg/phpdbg.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.h
Simple merge