- Mark Apache2, overload and aggregation as experimental

diff --git a/configure.in b/configure.in
index cfb554bcaf299ff75c6f21a89e21125b6d265565..890f3ddaa3264b3e6a9eba0754f6eed75b881513 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1123,6 +1123,42 @@ dnl  else
 dnl      rm -f main/internal_functions.c.old
 dnl  fi
 
+
+  # experimental things
+  if test $PHP_SAPI = "apache2filter" ; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| Apache 2 Support is EXPERIMENTAL and should NOT be used in         |"
+    echo "| production environment. Before submitting bug reports, try the     |"
+    echo "| latest CVS snapshot from http://snaps.php.net                      |"
+  fi
+
+  if test "$PHP_OVERLOAD" != "no"; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| The overload extension is highly EXPERIMENTAL and will most        |"
+    echo "| certainly change in newer versions. You have been warned!          |"
+  fi
+
+  if test "$PHP_AGGREGATE" != "no"; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| The aggregate functions are highly EXPERIMENTAL and will most      |"
+    echo "| certainly change in newer versions. You have been warned!          |"
+  fi
+
+  if test $UNAME = "FreeBSD" && test $PHP_SAPI = "apache2filter" && test $TSRM_PTH != "pth-config" ; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to  |"
+    echo "| add  --with-tsrm-pth to your ./configure line. Therefore you need  |"
+    echo "| to install gnu-pth from /usr/ports/devel/pth.                      |"
+  fi
+
   if test -n "$PHP_APXS_BROKEN"; then
     echo "+--------------------------------------------------------------------+"
     echo "| WARNING: Your $APXS script is most likely broken."

diff --git a/ext/overload/config.m4 b/ext/overload/config.m4
index a523c0e5ca0533dbab93c9501d39316a70068a26..4b0463ba5012b241192e4392f3e1c391704a3aec 100644 (file)
--- a/ext/overload/config.m4
+++ b/ext/overload/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_ENABLE(overload,whether to enable user-space object overloading support,
-[  --disable-overload      Disable user-space object overloading support.], yes)
+[  --enable-overload       EXPERIMENTAL: Enable user-space object overloading support.], no)
 
 if test "$PHP_OVERLOAD" != "no"; then
        AC_DEFINE(HAVE_OVERLOAD, 1, [ ])

diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 1e1ffd4aa397ee54b989e1831d8cbd6b3eb744f2..0c1a34a5ddb20cc972fe0ffbdf28e41d4b53f102 100644 (file)
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -21,6 +21,9 @@
 #include "php.h"
 #include "basic_functions.h"
 #include "aggregation.h"
+
+#ifdef HAVE_AGGREGATE
+
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 #include "ext/pcre/php_pcre.h"
 #endif
@@ -598,6 +601,8 @@ PHP_FUNCTION(deaggregate)
 }
 /* }}} */
 
+#endif /* HAVE_AGGREGATE */
+
 /*
  * Local variables:
  * tab-width: 4

diff --git a/ext/standard/aggregation.h b/ext/standard/aggregation.h
index 551782fdfe54b59d0412ae711809839f962f6e80..ff3eedbb70ecb17d96e68fcb90aa8cb977ab9d4a 100644 (file)
--- a/ext/standard/aggregation.h
+++ b/ext/standard/aggregation.h
@@ -18,6 +18,8 @@
 
 /* $Id$ */
 
+#ifdef HAVE_AGGREGATE
+
 #ifndef AGGREGATION_H
 #define AGGREGATION_H
 
@@ -49,3 +51,5 @@ PHP_FUNCTION(deaggregate);
 PHP_FUNCTION(aggregation_info);
 
 #endif /* AGGREGATION_H */
+
+#endif /* HAVE_AGGREGATE */

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b004fe0aa6a3049c78952b4cd6c736f214a94d30..2fae423907989254f9755c9fe1d4b36472abd344 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -816,6 +816,7 @@ function_entry basic_functions[] = {
        PHP_FE(str_rot13, NULL)
 
        /* functions from aggregate.c */
+#if HAVE_AGGREGATE
        PHP_FE(aggregate,                                               first_arg_force_ref)
        PHP_FE(aggregate_methods,                               first_arg_force_ref)
        PHP_FE(aggregate_methods_by_list,               first_arg_force_ref)
@@ -825,6 +826,7 @@ function_entry basic_functions[] = {
        PHP_FE(aggregate_properties_by_regexp,  first_arg_force_ref)
        PHP_FE(deaggregate,                                             first_arg_force_ref)
        PHP_FE(aggregation_info,                                first_arg_force_ref)
+#endif
        {NULL, NULL, NULL}
 };
 
@@ -908,7 +910,9 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC)
        BG(next) = NULL;
        BG(left) = -1;
        BG(user_tick_functions) = NULL;
+#ifdef HAVE_AGGREGATION
        BG(aggregation_table) = NULL;
+#endif
        zend_hash_init(&BG(sm_protected_env_vars), 5, NULL, NULL, 1);
        BG(sm_allowed_env_vars) = NULL;
 
@@ -1115,11 +1119,13 @@ PHP_RSHUTDOWN_FUNCTION(basic)
                BG(user_tick_functions) = NULL;
        }
 
+#ifdef HAVE_AGRGEGATION
        if (BG(aggregation_table)) {
                zend_hash_destroy(BG(aggregation_table));
                efree(BG(aggregation_table));
                BG(aggregation_table) = NULL;
        }
+#endif
 
 #ifdef HAVE_MMAP
        if (BG(mmap_file)) {

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 7b3d83d764e72529f3081eed949f5bdd57309354..11461763e86873a12fddfecce0345190321555c7 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -181,7 +181,9 @@ typedef struct {
        size_t mmap_len;
 #endif
 
+#ifdef HAVE_AGGREGATE
        HashTable *aggregation_table;
+#endif
 } php_basic_globals;
 
 #ifdef ZTS

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index e0043d23a78d41f1f2c48bff5980918c488d7abd..210908702c1141ae0e4d311217e582080e31c334 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -229,6 +229,14 @@ AC_ARG_WITH(system-regex,
   fi
 ])
 
+
+PHP_ARG_ENABLE(aggregate, whether to enable aggregation support,
+[  --enable-aggregate      EXPERIMENTAL: Enable user-space aggregation support.], no)
+
+if test "$PHP_AGGREGATE" != "no"; then
+  AC_DEFINE(HAVE_AGGREGATE, 1, [ ])
+fi
+
 if test "$PHP_SAPI" = "cgi"; then
   AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 fi