cvs: php4(PHP_4_2_0) / configure.in /ext/overload config.m4 /ext/standard aggregation.c aggregation.h basic_functions.c basic_functions.h config.m4
| From: | Derick Rethans | Date: | Thu, 11 Apr 2002 12:53:25 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) / configure.in /ext/overload config.m4 /ext/standard aggregation.c aggregation.h basic_functions.c basic_functions.h config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11034@lists.php.net to get a copy of this message | ||
derick Thu Apr 11 08:53:25 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard config.m4 aggregation.h aggregation.c
basic_functions.c basic_functions.h
/php4 configure.in
/php4/ext/overload config.m4
Log:
- Mark Apache2, overload and aggregation as experimental
Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.31 php4/ext/standard/config.m4:1.31.2.1 --- php4/ext/standard/config.m4:1.31 Tue Sep 11 22:07:46 2001 +++ php4/ext/standard/config.m4 Thu Apr 11 08:53:19 2002 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.31 2001/09/12 02:07:46 sniper Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.31.2.1 2002/04/11 12:53:19 derick Exp $ -*- sh -*- divert(3)dnl @@ -228,6 +228,14 @@ REGEX_TYPE=php 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]) Index: php4/ext/standard/aggregation.h diff -u php4/ext/standard/aggregation.h:1.2 php4/ext/standard/aggregation.h:1.2.2.1 --- php4/ext/standard/aggregation.h:1.2 Thu Feb 28 03:26:44 2002 +++ php4/ext/standard/aggregation.h Thu Apr 11 08:53:19 2002 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.h,v 1.2 2002/02/28 08:26:44 sebastian Exp $ */ +/* $Id: aggregation.h,v 1.2.2.1 2002/04/11 12:53:19 derick Exp $ */ + +#ifdef HAVE_AGGREGATE #ifndef AGGREGATION_H #define AGGREGATION_H @@ -49,3 +51,5 @@ PHP_FUNCTION(aggregation_info); #endif /* AGGREGATION_H */ + +#endif /* HAVE_AGGREGATE */ Index: php4/ext/standard/aggregation.c diff -u php4/ext/standard/aggregation.c:1.3.2.1 php4/ext/standard/aggregation.c:1.3.2.2 --- php4/ext/standard/aggregation.c:1.3.2.1 Thu Mar 21 20:12:52 2002 +++ php4/ext/standard/aggregation.c Thu Apr 11 08:53:19 2002 @@ -16,11 +16,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.c,v 1.3.2.1 2002/03/22 01:12:52 sniper Exp $ */ +/* $Id: aggregation.c,v 1.3.2.2 2002/04/11 12:53:19 derick Exp $ */ #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 @@ -597,6 +600,8 @@ } } /* }}} */ + +#endif /* HAVE_AGGREGATE */ /* * Local variables: Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.447.2.1 php4/ext/standard/basic_functions.c:1.447.2.2 --- php4/ext/standard/basic_functions.c:1.447.2.1 Sun Mar 17 15:54:57 2002 +++ php4/ext/standard/basic_functions.c Thu Apr 11 08:53:19 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.447.2.1 2002/03/17 20:54:57 sesser Exp $ */ +/* $Id: basic_functions.c,v 1.447.2.2 2002/04/11 12:53:19 derick Exp $ */ #include "php.h" #include "php_main.h" @@ -816,6 +816,7 @@ 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 @@ 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 @@ 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 @@ 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)) { Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.103 php4/ext/standard/basic_functions.h:1.103.2.1 --- php4/ext/standard/basic_functions.h:1.103 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/basic_functions.h Thu Apr 11 08:53:22 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.103 2002/02/21 03:32:42 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.103.2.1 2002/04/11 12:53:22 derick Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -181,7 +181,9 @@ size_t mmap_len; #endif +#ifdef HAVE_AGGREGATE HashTable *aggregation_table; +#endif } php_basic_globals; #ifdef ZTS Index: php4/configure.in diff -u php4/configure.in:1.302.2.10 php4/configure.in:1.302.2.11 --- php4/configure.in:1.302.2.10 Thu Apr 11 06:03:02 2002 +++ php4/configure.in Thu Apr 11 08:53:23 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.302.2.10 2002/04/11 10:03:02 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.302.2.11 2002/04/11 12:53:23 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1122,6 +1122,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 "+--------------------------------------------------------------------+" Index: php4/ext/overload/config.m4 diff -u php4/ext/overload/config.m4:1.4 php4/ext/overload/config.m4:1.4.2.1 --- php4/ext/overload/config.m4:1.4 Sun Dec 9 19:38:18 2001 +++ php4/ext/overload/config.m4 Thu Apr 11 08:53:24 2002 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.4 2001/12/10 00:38:18 sniper Exp $ +dnl $Id: config.m4,v 1.4.2.1 2002/04/11 12:53:24 derick Exp $ 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, [ ])
Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.31 php4/ext/standard/config.m4:1.31.2.1 --- php4/ext/standard/config.m4:1.31 Tue Sep 11 22:07:46 2001 +++ php4/ext/standard/config.m4 Thu Apr 11 08:53:19 2002 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.31 2001/09/12 02:07:46 sniper Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.31.2.1 2002/04/11 12:53:19 derick Exp $ -*- sh -*- divert(3)dnl @@ -228,6 +228,14 @@ REGEX_TYPE=php 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]) Index: php4/ext/standard/aggregation.h diff -u php4/ext/standard/aggregation.h:1.2 php4/ext/standard/aggregation.h:1.2.2.1 --- php4/ext/standard/aggregation.h:1.2 Thu Feb 28 03:26:44 2002 +++ php4/ext/standard/aggregation.h Thu Apr 11 08:53:19 2002 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.h,v 1.2 2002/02/28 08:26:44 sebastian Exp $ */ +/* $Id: aggregation.h,v 1.2.2.1 2002/04/11 12:53:19 derick Exp $ */ + +#ifdef HAVE_AGGREGATE #ifndef AGGREGATION_H #define AGGREGATION_H @@ -49,3 +51,5 @@ PHP_FUNCTION(aggregation_info); #endif /* AGGREGATION_H */ + +#endif /* HAVE_AGGREGATE */ Index: php4/ext/standard/aggregation.c diff -u php4/ext/standard/aggregation.c:1.3.2.1 php4/ext/standard/aggregation.c:1.3.2.2 --- php4/ext/standard/aggregation.c:1.3.2.1 Thu Mar 21 20:12:52 2002 +++ php4/ext/standard/aggregation.c Thu Apr 11 08:53:19 2002 @@ -16,11 +16,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.c,v 1.3.2.1 2002/03/22 01:12:52 sniper Exp $ */ +/* $Id: aggregation.c,v 1.3.2.2 2002/04/11 12:53:19 derick Exp $ */ #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 @@ -597,6 +600,8 @@ } } /* }}} */ + +#endif /* HAVE_AGGREGATE */ /* * Local variables: Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.447.2.1 php4/ext/standard/basic_functions.c:1.447.2.2 --- php4/ext/standard/basic_functions.c:1.447.2.1 Sun Mar 17 15:54:57 2002 +++ php4/ext/standard/basic_functions.c Thu Apr 11 08:53:19 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.447.2.1 2002/03/17 20:54:57 sesser Exp $ */ +/* $Id: basic_functions.c,v 1.447.2.2 2002/04/11 12:53:19 derick Exp $ */ #include "php.h" #include "php_main.h" @@ -816,6 +816,7 @@ 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 @@ 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 @@ 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 @@ 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)) { Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.103 php4/ext/standard/basic_functions.h:1.103.2.1 --- php4/ext/standard/basic_functions.h:1.103 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/basic_functions.h Thu Apr 11 08:53:22 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.103 2002/02/21 03:32:42 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.103.2.1 2002/04/11 12:53:22 derick Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -181,7 +181,9 @@ size_t mmap_len; #endif +#ifdef HAVE_AGGREGATE HashTable *aggregation_table; +#endif } php_basic_globals; #ifdef ZTS Index: php4/configure.in diff -u php4/configure.in:1.302.2.10 php4/configure.in:1.302.2.11 --- php4/configure.in:1.302.2.10 Thu Apr 11 06:03:02 2002 +++ php4/configure.in Thu Apr 11 08:53:23 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.302.2.10 2002/04/11 10:03:02 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.302.2.11 2002/04/11 12:53:23 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1122,6 +1122,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 "+--------------------------------------------------------------------+" Index: php4/ext/overload/config.m4 diff -u php4/ext/overload/config.m4:1.4 php4/ext/overload/config.m4:1.4.2.1 --- php4/ext/overload/config.m4:1.4 Sun Dec 9 19:38:18 2001 +++ php4/ext/overload/config.m4 Thu Apr 11 08:53:24 2002 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.4 2001/12/10 00:38:18 sniper Exp $ +dnl $Id: config.m4,v 1.4.2.1 2002/04/11 12:53:24 derick Exp $ 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, [ ])