CVS update: php3

Date: Tuesday October 6, 1998 @ 9:51 Author: jah Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv22949 Modified Files: ChangeLog Makefile.in acconfig.h build-defs.h.in config.h.in configure.in internal_functions.c libphp3.module.in Log Message: Started work on InterBase support. Seems to be working somehow, not much features yet. Tested only on Linux & InterBase 4.0. Index: php3/ChangeLog diff -c php3/ChangeLog:1.502 php3/ChangeLog:1.503 *** php3/ChangeLog:1.502 Mon Oct 5 12:14:49 1998 --- php3/ChangeLog Tue Oct 6 09:51:35 1998 *************** *** 1,6 **** --- 1,7 ---- 'PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??, Version 3.0.6 + - Added minimal InterBase support. Tested only on 4.0 & Linux. - Fixed some memory leaks and bogus error messages in the URL handler of the various file open functions. Should only affect error handling in bad URLs. Index: php3/Makefile.in diff -c php3/Makefile.in:1.264 php3/Makefile.in:1.265 *** php3/Makefile.in:1.264 Sun Oct 4 13:17:34 1998 --- php3/Makefile.in Tue Oct 6 09:51:36 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.264 1998/10/04 17:17:34 zeev Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.265 1998/10/06 13:51:36 jah Exp $ # prefix = @prefix@ *************** *** 37,43 **** AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ --- 37,43 ---- AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 89,99 **** functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ functions/hw.c functions/hg_comm.c functions/dlist.c \ ! functions/snmp.c functions/var.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @LIBS@ all: $(BINNAME) --- 89,99 ---- functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ functions/hw.c functions/hg_comm.c functions/dlist.c \ ! functions/snmp.c functions/var.c functions/interbase.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 617,622 **** --- 617,627 ---- mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ internal_functions.h modules.h functions/reg.h functions/post.h \ functions/php3_string.h functions/php3_var.h + functions/interbase.o: functions/interbase.c config.h php.h php_version.h \ + request_info.h php3_hash.h alloc.h safe_mode.h \ + fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \ + variables.h constants.h internal_functions.h modules.h \ + functions/php3_interbase.h php3_list.h functions/php3_string.h # Local Variables: Index: php3/acconfig.h diff -c php3/acconfig.h:1.66 php3/acconfig.h:1.67 *** php3/acconfig.h:1.66 Mon Sep 21 18:35:50 1998 --- php3/acconfig.h Tue Oct 6 09:51:37 1998 *************** *** 186,191 **** --- 186,195 ---- #define IFX_VERSION 0 #endif + #ifndef HAVE_IBASE + #define HAVE_IBASE 0 + #endif + #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 #endif Index: php3/build-defs.h.in diff -c php3/build-defs.h.in:1.18 php3/build-defs.h.in:1.19 *** php3/build-defs.h.in:1.18 Sun Aug 9 15:05:31 1998 --- php3/build-defs.h.in Tue Oct 6 09:51:37 1998 *************** *** 41,46 **** --- 41,49 ---- #define PHP_DEBUG "@PHP_DEBUG@" #define PHP_GDBM_INCLUDE "@GDBM_INCLUDE@" #define PHP_HSREGEX "@HSREGEX@" + #define PHP_IBASE_INCLUDE "@IBASE_INCLUDE@" + #define PHP_IBASE_LFLAGS "@IBASE_LFLAGS@" + #define PHP_IBASE_LIBS "@IBASE_LIBS@" #define PHP_IFX_INCLUDE "@IFX_INCLUDE@" #define PHP_IFX_LFLAGS "@IFX_LFLAGS@" #define PHP_IFX_LIBS "@IFX_LIBS@" Index: php3/config.h.in diff -c php3/config.h.in:1.116 php3/config.h.in:1.117 *** php3/config.h.in:1.116 Mon Sep 21 18:35:51 1998 --- php3/config.h.in Tue Oct 6 09:51:38 1998 *************** *** 232,237 **** --- 232,241 ---- #define IFX_VERSION 0 #endif + #ifndef HAVE_IBASE + #define HAVE_IBASE 0 + #endif + #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 #endif Index: php3/configure.in diff -c php3/configure.in:1.261 php3/configure.in:1.262 *** php3/configure.in:1.261 Mon Oct 5 17:53:39 1998 --- php3/configure.in Tue Oct 6 09:51:38 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.261 1998/10/05 21:53:39 ssb Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.262 1998/10/06 13:51:38 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 213,219 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@DBASE_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" --- 213,219 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@DBASE_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" *************** *** 1177,1182 **** --- 1177,1212 ---- AC_SUBST(IFX_LIBS) AC_SUBST(IFX_LFLAGS) AC_SUBST(IFX_INCLUDE) + + AC_MSG_CHECKING(for InterBase support) + AC_ARG_WITH(interbase, + [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base + install directory, defaults to /usr/interbase], + [ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + IBASE_INCDIR=/usr/interbase/include + IBASE_LIBDIR=/usr/interbase/lib + else + IBASE_INCDIR=$withval/include + IBASE_LIBDIR=$withval/lib + fi + IBASE_INCLUDE=-I$IBASE_INCDIR + IBASE_LFLAGS=-L$IBASE_LIBDIR + IBASE_LIBS="-lgds" + + AC_DEFINE(HAVE_IBASE) + + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ],[ + AC_MSG_RESULT(no) + ]) + AC_SUBST(IBASE_INCLUDE) + AC_SUBST(IBASE_LIBS) + AC_SUBST(IBASE_LFLAGS) AC_MSG_CHECKING(for a custom ODBC support) AC_ARG_WITH(custom-odbc, Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.327 php3/internal_functions.c:1.328 *** php3/internal_functions.c:1.327 Sat Oct 3 20:19:33 1998 --- php3/internal_functions.c Tue Oct 6 09:51:39 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.327 1998/10/04 00:19:33 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.328 1998/10/06 13:51:39 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 89,94 **** --- 89,95 ---- #include "dl/snmp/php3_snmp.h" #include "functions/php3_zlib.h" #include "functions/php3_COM.h" + #include "functions/php3_interbase.h" extern php3_ini_structure php3_ini; *************** *** 144,149 **** --- 145,151 ---- {"Zlib", php3_zlib_module_ptr}, {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, + {"InterBase", php3_ibase_module_ptr}, {NULL, NULL} }; Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.13 php3/libphp3.module.in:1.14 *** php3/libphp3.module.in:1.13 Sat Oct 3 17:43:37 1998 --- php3/libphp3.module.in Tue Oct 6 09:51:40 1998 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net