diff options
| author | Remi Collet <remi@php.net> | 2019-03-20 11:55:44 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-03-20 11:55:44 +0100 |
| commit | ed808c59e47ee95b81fc769da512d84683ac0a7c (patch) | |
| tree | 9690f4d9ad527327f4ea5d89fc8aa8004a056bdd /build | |
| parent | fb109bacea314043d707c1d32734f4513ee616b3 (diff) | |
| parent | 999370b75620781bd5051d07ef671103624a0018 (diff) | |
| download | php-git-ed808c59e47ee95b81fc769da512d84683ac0a7c.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
NEWS
Revert "Fix #77609: Tests from mailparse extension fails"
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.global | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/Makefile.global b/build/Makefile.global index 9e1fa9738c..14d0365cc8 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -83,21 +83,20 @@ PHP_TEST_SHARED_EXTENSIONS = ` \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ done; \ fi` -PHP_FILTERED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|zend_extension(_debug)?(_ts)?)[\t\ ]*=' -PHP_EXTENSION_PATH_FIX_REGEX = "/^extension *= *[^/]/s,extension *= *,extension=$(EXTENSION_DIR)/,g" +PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' test: all @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ if test "$$INI_FILE"; then \ - $(EGREP) -h -v $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_FILE" | $(SED) $(PHP_EXTENSION_PATH_FIX_REGEX) > $(top_builddir)/tmp-php.ini; \ + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ else \ echo > $(top_builddir)/tmp-php.ini; \ fi; \ INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ if test "$$INI_SCANNED_PATH"; then \ INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ - $(EGREP) -h -v $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini | $(SED) $(PHP_EXTENSION_PATH_FIX_REGEX) >> $(top_builddir)/tmp-php.ini; \ + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ fi; \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ |