Merge remote-tracking branch 'sektioneins/master'

1 files changed, 13 insertions, 3 deletions

diff --git a/src/config.m4 b/src/config.m4
index e4cc1f5..a421c0c 100644
--- a/src/config.m4
+++ b/src/config.m4
@@ -7,6 +7,7 @@ sources="$sources sp_disabled_functions.c sp_execute.c sp_upload_validation.c"
 sources="$sources sp_cookie_encryption.c sp_network_utils.c tweetnacl.c"
 sources="$sources sp_config_keywords.c sp_var_parser.c sp_var_value.c sp_tree.c"
 sources="$sources sp_pcre_compat.c sp_crypt.c sp_session.c sp_sloppy.c sp_wrapper.c"
+sources="$sources sp_ini.c sp_php_compat.c sp_config_scanner.c sp_ifilter.c"
 
 PHP_ARG_ENABLE(snuffleupagus, whether to enable snuffleupagus support,
 [  --enable-snuffleupagus           Enable snuffleupagus support])
@@ -17,18 +18,24 @@ PHP_ARG_ENABLE(coverage, whether to enable coverage support,
 PHP_ARG_ENABLE(debug, whether to enable debug messages,
 [  --enable-debug           Enable debug messages], no, no)
 
+PHP_ARG_ENABLE(debug-stderr, whether to enable debug messages,
+[  --enable-debug-stderr           Enable debug messages], no, no)
+
 AC_PROG_CC_STDC()
 
 CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
 CFLAGS="$CFLAGS -Wformat=2 -Wformat-security -D_FORTIFY_SOURCE=2"
-CFLAGS="$CFLAGS -fstack-protector"
+CFLAGS="$CFLAGS -fstack-protector-strong"
 
 LDFLAGS="$LDFLAGS `pcre2-config --libs8`"
 
 if test "$PHP_DEBUG" = "yes"; then
-        AC_DEFINE(SP_DEBUG, 1, [Wether you want to enable debug messages])
-      CFLAGS="$CFLAGS -g -ggdb -O0"
+  AC_DEFINE(SP_DEBUG, 1, [Enable SP debug messages])
+  CFLAGS="$CFLAGS -g -ggdb -O0"
+  if test "$PHP_DEBUG_STDERR" = "yes"; then
+    AC_DEFINE(SP_DEBUG_STDERR, 1, [Print SP debug messages to stderr])
+  fi
 fi
 
 AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE(HAVE_PCRE, 1, [have pcre]))
@@ -39,3 +46,6 @@ if test "$PHP_SNUFFLEUPAGUS" = "yes"; then
    fi
    PHP_NEW_EXTENSION(snuffleupagus, $sources, $ext_shared,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 fi
+
+# PHP_PROG_RE2C([2.0])
+PHP_ADD_MAKEFILE_FRAGMENT()