- Fixed bug #49935 (Deprecated warnings make "make test" to fail)

diff --git a/Makefile.global b/Makefile.global
index 0c9b4750388018a49f4629f203962479af8bb56b..4f7d6d9e9b28ca8d0ae3e2db8e4f6b2bb516a95c 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -79,19 +79,20 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
                        . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
                done; \
        fi`
+PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|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) -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_FILE" > $(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 '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(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) \

diff --git a/main/main.c b/main/main.c
index cffafda9709a0bf9609c77c3d61c1f518e73eae9..8d9904e3f5ba0f5daa1d9d4ef32adbc27c8cd6b7 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -2056,6 +2056,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        }
 
        /* Check for removed directives */
+       /* NOTE: If you add anything here, remember to add it also in Makefile.global! */
        {
                static const char *directives[] = {
                        "define_syslog_variables",