Merge branch 'PHP-7.0' into PHP-7.1

smalyshev · smalyshev · commit 223b8c15a871 · 2018-11-28T15:46:53.000-08:00
* PHP-7.0:
  Add DISPLAY_INI_ENTRIES for imap
  Disable rsh/ssh functionality in imap by default (bug #77153)
  Disable rsh/ssh functionality in imap by default (bug #77153)
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap)
 	php_info_print_table_row(2, "Kerberos Support", "enabled");
 #endif
 	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap)`
`1153`	`1153`	`php_info_print_table_row(2, "Kerberos Support", "enabled");`
`1154`	`1154`	`#endif`
`1155`	`1155`	`php_info_print_table_end();`
	`1156`	`+`
	`1157`	`+ DISPLAY_INI_ENTRIES();`
`1156`	`1158`	`}`
`1157`	`1159`	`/* }}} */`
`1158`	`1160`