Merge branch 'PHP-7.1' into PHP-7.2

weltling · weltling · commit f282b7720ab3 · 2017-12-01T16:03:09.000+01:00
* PHP-7.1:
  Consider Xdebug for tmi ini generation, too
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1941,7 +1941,7 @@ function generate_tmp_php_ini()
 		}
 		
 		var directive = "extension";
-		if ("opcache" == extensions_enabled[i][0]) {
+		if ("opcache" == extensions_enabled[i][0] || "xdebug" == extensions_enabled[i][0]) {
 			directive = "zend_extension";
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1941,7 +1941,7 @@ function generate_tmp_php_ini()`
`1941`	`1941`	`}`
`1942`	`1942`
`1943`	`1943`	`var directive = "extension";`
`1944`		`- if ("opcache" == extensions_enabled[i][0]) {`
	`1944`	`+ if ("opcache" == extensions_enabled[i][0] \|\| "xdebug" == extensions_enabled[i][0]) {`
`1945`	`1945`	`directive = "zend_extension";`
`1946`	`1946`	`}`
`1947`	`1947`