Merge branch 'PHP-7.1'

bwoebi · bwoebi · commit e4db84f231af · 2016-12-20T19:49:25.000+01:00
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -72,7 +72,7 @@ PHP_INI_END()
 
 static zend_bool phpdbg_booted = 0;
 static zend_bool phpdbg_fully_started = 0;
-zend_bool use_mm_wrappers = 0;
+zend_bool use_mm_wrappers = 1;
 
 static void php_phpdbg_destroy_bp_file(zval *brake) /* {{{ */
 {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ PHP_INI_END()`
`72`	`72`
`73`	`73`	`static zend_bool phpdbg_booted = 0;`
`74`	`74`	`static zend_bool phpdbg_fully_started = 0;`
`75`		`-zend_bool use_mm_wrappers = 0;`
	`75`	`+zend_bool use_mm_wrappers = 1;`
`76`	`76`
`77`	`77`	`static void php_phpdbg_destroy_bp_file(zval brake) / {{{ */`
`78`	`78`	`{`