Merge branch 'PHP-7.0' into PHP-7.1

diff --cc sapi/phpdbg/phpdbg.c
index ba13b93646102a80e3707d4e760dd4e17a67f8c4,8153772368f0289ced085192961ae86aa7648bce..96f1613a59199e8d2331a4009f95b241fffc92fd
--- 1/sapi/phpdbg/phpdbg.c
--- 2/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@@ -72,65 -76,6 +72,64 @@@ PHP_INI_END(
  
  static zend_bool phpdbg_booted = 0;
  static zend_bool phpdbg_fully_started = 0;
-       efree(source->filename);
 +zend_bool use_mm_wrappers = 1;
 +
 +static void php_phpdbg_destroy_bp_file(zval *brake) /* {{{ */
 +{
 +      zend_hash_destroy(Z_ARRVAL_P(brake));
 +      efree(Z_ARRVAL_P(brake));
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_bp_symbol(zval *brake) /* {{{ */
 +{
 +      efree((char *) ((phpdbg_breaksymbol_t *) Z_PTR_P(brake))->symbol);
 +      efree(Z_PTR_P(brake));
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_bp_opcode(zval *brake) /* {{{ */
 +{
 +      efree((char *) ((phpdbg_breakop_t *) Z_PTR_P(brake))->name);
 +      efree(Z_PTR_P(brake));
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_bp_opline(zval *brake) /* {{{ */
 +{
 +      efree(Z_PTR_P(brake));
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_bp_methods(zval *brake) /* {{{ */
 +{
 +      zend_hash_destroy(Z_ARRVAL_P(brake));
 +      efree(Z_ARRVAL_P(brake));
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_bp_condition(zval *data) /* {{{ */
 +{
 +      phpdbg_breakcond_t *brake = (phpdbg_breakcond_t *) Z_PTR_P(data);
 +
 +      if (brake->ops) {
 +              destroy_op_array(brake->ops);
 +              efree(brake->ops);
 +      }
 +      efree((char*) brake->code);
 +      efree(brake);
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_registered(zval *data) /* {{{ */
 +{
 +      zend_function *function = (zend_function *) Z_PTR_P(data);
 +      destroy_zend_function(function);
 +} /* }}} */
 +
 +static void php_phpdbg_destroy_file_source(zval *data) /* {{{ */
 +{
 +      phpdbg_file_source *source = (phpdbg_file_source *) Z_PTR_P(data);
 +      destroy_op_array(&source->op_array);
 +      if (source->buf) {
 +              efree(source->buf);
 +      }
 +      efree(source);
 +} /* }}} */
  
  static inline void php_phpdbg_globals_ctor(zend_phpdbg_globals *pg) /* {{{ */
  {

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

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

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