untested features must be enabled: configure --enable-suhosin-experimental

3 files changed, 18 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index a2e673f..cd5d051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,12 @@
 .DS_Store
-/config.*
+/config.log
+config.guess
+config.h
+config.h.in
+config.h.in~
+config.nice
+config.status
+config.sub
 /*.lo
 /.deps
 /.libs/
diff --git a/config.m4 b/config.m4
index ee4b7ba..01edafd 100644
--- a/config.m4
+++ b/config.m4
@@ -7,3 +7,10 @@ PHP_ARG_ENABLE(suhosin, whether to enable suhosin support,
 if test "$PHP_SUHOSIN" != "no"; then
   PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c rfc1867_new.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
 fi
+
+PHP_ARG_ENABLE(suhosin-experimental, whether to enable experimental suhosin features,
+[  --enable-suhosin-experimental        Enable experimental suhosin features], no, no)
+
+if test "$PHP_SUHOSIN_EXPERIMENTAL" != "no"; then
+  AC_DEFINE(SUHOSIN_EXPERIMENTAL, 1, [Whether to enable experimental suhosin features])
+fi
diff --git a/execute.c b/execute.c
index f2877d4..82a4866 100644
--- a/execute.c
+++ b/execute.c
@@ -1618,6 +1618,7 @@ internal_function_handler ihandlers[] = {
         { "mysql_db_query", ih_querycheck, (void *)2, (void *)1, NULL },
         { "mysql_unbuffered_query", ih_querycheck, (void *)1, (void *)1, NULL },
         
+#ifdef SUHOSIN_EXPERIMENTAL
         /* MaxDB */
         { "maxdb::maxdb", ih_fixusername, (void *)2, NULL, NULL },
         { "maxdb_connect", ih_fixusername, (void *)2, NULL, NULL },
@@ -1671,7 +1672,8 @@ internal_function_handler ihandlers[] = {
         /* Microsoft SQL Server */
         { "mssql_connect", ih_fixusername, (void *)2, NULL, NULL },
         { "mssql_pconnect", ih_fixusername, (void *)2, NULL, NULL },
-        
+#endif
+
         { NULL, NULL, NULL, NULL, NULL }
 };