[PHP4BETA] CVS update: php4

Date: Monday May 3, 1999 @ 7:11 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv12063 Modified Files: .cvsignore Makefile.in acconfig.h.in acinclude.m4 buildconf configure.in.in foo internal_functions_registry.h Added Files: genif.pl internal_functions.c.in Removed Files: internal_functions.c Log Message: * added --enable-thread-safety switch * now generating internal_functions.c Index: php4/.cvsignore diff -u php4/.cvsignore:1.6 php4/.cvsignore:1.7 --- php4/.cvsignore:1.6 Wed Apr 21 11:16:30 1999 +++ php4/.cvsignore Mon May 3 07:11:20 1999 @@ -17,3 +17,4 @@ aclocal.m4 configure.in acconfig.h +internal_functions.c Index: php4/Makefile.in diff -u php4/Makefile.in:1.25 php4/Makefile.in:1.26 --- php4/Makefile.in:1.25 Mon Apr 26 15:48:10 1999 +++ php4/Makefile.in Mon May 3 07:11:20 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.25 1999/04/26 19:48:10 zeev Exp $ +# $Id: Makefile.in,v 1.26 1999/05/03 11:11:20 ssb Exp $ # prefix = @prefix@ @@ -34,7 +34,7 @@ bindir = @bindir@ ZEND_DIR = $(srcdir)/libzend -SUBDIRS=$(srcdir)/libzend ext +SUBDIRS=$(srcdir)/libzend ext @TSRM_DIR@ CC = @CC@ AR = ar rc @@ -43,7 +43,7 @@ EXTRA_LIBS = @EXTRA_LIBS@ EXT_LIBS = @EXT_LIBS@ INCLUDES = @INCLUDES@ -INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) $(INCLUDES) +INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) -I$(srcdir)/TSRM $(INCLUDES) PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -83,20 +83,20 @@ done && test -z "$$fail" # CGI binary or fhttpd module -php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ +php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules libphp3.a libmodphp3.a: all-recursive $(OBJS) $(AR) $@.tmp $(OBJS) - $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a + $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@ @rm -f $@.tmp $(RANLIB) $(BINNAME) # Apache modules libmodphp3-so.a: all-recursive $(OBJS) $(AR) $@.tmp $(OBJS) - $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a + $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@ @rm -f $@.tmp $(RANLIB) libmodphp3-so.a Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.15 php4/acconfig.h.in:1.16 --- php4/acconfig.h.in:1.15 Sun Apr 25 10:10:22 1999 +++ php4/acconfig.h.in Mon May 3 07:11:20 1999 @@ -120,3 +120,6 @@ /* Define if you have broken sprintf function like SunOS 4 */ #define BROKEN_SPRINTF 0 + +/* Define to compile PHP/Zend thread safe */ +/* #undef ZTS */ Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.9 php4/acinclude.m4:1.10 --- php4/acinclude.m4:1.9 Mon Apr 26 14:06:04 1999 +++ php4/acinclude.m4 Mon May 3 07:11:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.9 1999/04/26 18:06:04 andrey Exp $ +dnl $Id: acinclude.m4,v 1.10 1999/05/03 11:11:20 ssb Exp $ dnl dnl This file contains local autoconf functions. @@ -71,8 +71,13 @@ _extlib="libphpext_$1.a" EXT_LIBS="$EXT_LIBS $1/$_extlib" EXTINFO_DEPS="$EXTINFO_DEPS ../ext/$1/extinfo.c.stub" +dnl EXT_INCLUDE_CODE="\#include \"ext/$1/php3_$1.h\"\\n$EXT_INCLUDE_CODE" +dnl EXT_MODULE_PTRS="phpext_$1_ptr, $EXT_MODULE_PTRS" +dnl " ]) AC_SUBST(EXT_SUBDIRS) AC_SUBST(EXT_LIBS) AC_SUBST(EXTINFO_DEPS) +dnl AC_SUBST(EXT_INCLUDE_CODE) +dnl AC_SUBST(EXT_MODULES_PTRS) Index: php4/buildconf diff -u php4/buildconf:1.8 php4/buildconf:1.9 --- php4/buildconf:1.8 Wed Apr 21 16:32:56 1999 +++ php4/buildconf Mon May 3 07:11:20 1999 @@ -24,5 +24,5 @@ echo created or modified configure fi -cd libzend; ./buildconf libzend/ - +(cd libzend; ./buildconf libzend/) +(cd TSRM; ./buildconf TSRM/) Index: php4/configure.in.in diff -u php4/configure.in.in:1.22 php4/configure.in.in:1.23 --- php4/configure.in.in:1.22 Mon Apr 26 13:26:32 1999 +++ php4/configure.in.in Mon May 3 07:11:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.22 1999/04/26 17:26:32 zeev Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.23 1999/05/03 11:11:20 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -11,12 +11,17 @@ ## This is to prevent "./config.status --recheck" from ## running configure in libzend again. --no-recursion) recurse=no;; + --enable-thread-safety) threadsafe=yes;; *) ;; esac done if test "$recurse" = "yes"; then - (cwd=pwd; set -x; cd $srcdir/libzend; ./configure --cache-file=$cwd/config.cache $@) + cwd=pwd + (set -x; cd $srcdir/libzend; ./configure --cache-file=$cwd/config.cache $@) + if test "$threadsafe" = "yes"; then + (set -x; cd $srcdir/TSRM; ./configure --cache-file=$cwd/config.cache $@) + fi fi dnl ## Diversion 1 is the initial checking of OS features, programs, @@ -699,6 +704,18 @@ ]) +AC_MSG_CHECKING(whether to build PHP thread-safe) +AC_ARG_ENABLE(thread-safety, +[ --enable-thread-safety Whether to build PHP thread-safe.],[ + TSRM_LIB='TSRM/libtsrm.a' + TSRM_DIR=TSRM + AC_DEFINE(ZTS) +],[ + TSRM_DIR="" +]) +AC_SUBST(TSRM_DIR) +AC_SUBST(TSRM_LIB) + dnl AC_MSG_CHECKING(whether to enable PHP RPC support) dnl AC_ARG_ENABLE(php-rpc, dnl [ --enable-php-rpc Compile with PHP RPC support.], @@ -853,6 +870,20 @@ @@EXT_MAKEFILES@@, [ chmod +x scripts/mkextlib ], [ + +# Hacking while airborne considered harmful. +# +echo "creating internal_functions.c" +extensions=\grep '^s.@EXT_SUBDIRS@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\ +mv -f internal_functions.c internal_functions.c.old 2>/dev/null +perl genif.pl internal_functions.c.in \$extensions > internal_functions.c +if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then + echo "internal_functions.c is unchanged" + mv internal_functions.c.old internal_functions.c +else + rm -f internal_functions.c.old +fi + dnl Warn about CGI version with no extra security options. if test "$BINNAME" = "php"; then Index: php4/foo diff -u php4/foo:1.1.1.1 php4/foo:1.2 --- php4/foo:1.1.1.1 Wed Apr 7 17:01:58 1999 +++ php4/foo Mon May 3 07:11:20 1999 @@ -1,9 +1,5 @@ -*** Testing assignments and variable aliasing: ***<br> -<?php - /* This test tests assignments to variables using other variables as variable-names */ - $a = "b"; - print "hey"; - $$a = "test"; - $$$a = "blah"; - print "hey"; -?> +a +b +@c@ +d +e Index: php4/internal_functions_registry.h diff -u php4/internal_functions_registry.h:1.1.1.1 php4/internal_functions_registry.h:1.2 --- php4/internal_functions_registry.h:1.1.1.1 Wed Apr 7 17:02:10 1999 +++ php4/internal_functions_registry.h Mon May 3 07:11:20 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions_registry.h,v 1.1.1.1 1999/04/07 21:02:10 zeev Exp $ */ +/* $Id: internal_functions_registry.h,v 1.2 1999/05/03 11:11:20 ssb Exp $ */ #ifndef _INTERNAL_FUNCTIONS_REGISTRY_H #define _INTERNAL_FUNCTIONS_REGISTRY_H @@ -38,10 +38,10 @@ #if APACHE extern php3_module_entry apache_module_entry; -#define apache_module_ptr &apache_module_entry +#define phpext_apache_ptr &apache_module_entry extern void php3_virtual(INTERNAL_FUNCTION_PARAMETERS); #else -#define apache_module_ptr NULL +#define phpext_apache_ptr NULL #endif /* environment functions */ -- PHP 4 Beta