CVS update: php3

Date: Friday September 18, 1998 @ 12:55 Author: rasmus Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv14325 Modified Files: CREDITS Makefile.in acconfig.h config.h.in configure.in control_structures_inline.h language-parser.y libphp3.module.in variables.c variables.h Log Message: Static snmp module Index: php3/CREDITS diff -c php3/CREDITS:1.33 php3/CREDITS:1.34 *** php3/CREDITS:1.33 Mon Aug 10 09:18:30 1998 --- php3/CREDITS Fri Sep 18 12:54:57 1998 *************** *** 68,73 **** --- 68,76 ---- * Bjørn Borud (borud@guardian.no) soundex code and lots of enthusiasm + * Christian Cartus (chc@idgruppe.de) + Informix Universal Server support + * John Ellson (ellson@lucent.com) Freetype support Index: php3/Makefile.in diff -c php3/Makefile.in:1.259 php3/Makefile.in:1.260 *** php3/Makefile.in:1.259 Thu Sep 17 08:09:58 1998 --- php3/Makefile.in Fri Sep 18 12:54:57 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.259 1998/09/17 12:09:58 jah Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.260 1998/09/18 16:54:57 rasmus 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@ 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@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 88,98 **** functions/unified_odbc.c functions/ldap.c functions/browscap.c \ 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 = $(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@ @LIBS@ all: $(BINNAME) --- 88,99 ---- functions/unified_odbc.c functions/ldap.c functions/browscap.c \ 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 = $(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) Index: php3/acconfig.h diff -c php3/acconfig.h:1.63 php3/acconfig.h:1.64 *** php3/acconfig.h:1.63 Wed Sep 9 08:38:04 1998 --- php3/acconfig.h Fri Sep 18 12:54:58 1998 *************** *** 10,15 **** --- 10,18 ---- /* define uint by configure if it is missed (QNX and BSD derived) */ #undef uint + /* type check for in_addr_t */ + #undef in_addr_t + /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */ /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */ #define HAVE_DIRENT_H 0 *************** *** 96,101 **** --- 99,107 ---- /* Define if you want the LDAP directory interface */ #define HAVE_LDAP 0 + + /* Define if you want the SNMP interface */ + #define HAVE_SNMP 0 /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 Index: php3/config.h.in diff -c php3/config.h.in:1.113 php3/config.h.in:1.114 *** php3/config.h.in:1.113 Wed Sep 9 08:38:05 1998 --- php3/config.h.in Fri Sep 18 12:54:58 1998 *************** *** 77,82 **** --- 77,85 ---- /* define uint by configure if it is missed (QNX and BSD derived) */ #undef uint + /* type check for in_addr_t */ + #undef in_addr_t + /* Define if you have the resolv library (-lresolv). */ #define HAVE_LIBRESOLV 0 *************** *** 142,147 **** --- 145,153 ---- /* Define if you want the LDAP directory interface */ #define HAVE_LDAP 0 + + /* Define if you want the SNMP interface */ + #define HAVE_SNMP 0 /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 Index: php3/configure.in diff -c php3/configure.in:1.245 php3/configure.in:1.246 *** php3/configure.in:1.245 Thu Sep 17 08:09:59 1998 --- php3/configure.in Fri Sep 18 12:54:59 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.245 1998/09/17 12:09:59 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.246 1998/09/18 16:54:59 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 97,102 **** --- 97,122 ---- ]) ]) + dnl AIX keeps in_addr_t in /usr/include/netinet/in.h + AC_MSG_CHECKING(for in_addr_t) + AC_CACHE_VAL(ac_cv_type_$1, + [AC_EGREP_CPP(dnl + changequote(<<,>>)dnl + <<in_addr_t[^a-zA-Z_0-9]>>dnl + changequote([,]), [#include <sys/types.h> + #if STDC_HEADERS + #include <stdlib.h> + #include <stddef.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl + + AC_MSG_RESULT($ac_cv_type_in_addr_t) + if test $ac_cv_type_in_addr_t = no; then + AC_DEFINE(in_addr_t, u_int) + fi + dnl Checks for header files. AC_HEADER_STDC *************** *** 996,1001 **** --- 1016,1052 ---- AC_SUBST(LDAP_LFLAGS) AC_SUBST(LDAP_INCLUDE) + AC_MSG_CHECKING(for SNMP support) + AC_ARG_WITH(snmp, + [ --with-snmp[=DIR] Include SNMP support. DIR is the SNMP base + install directory, defaults to /usr/local], + [ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + SNMP_INCDIR=/usr/local/include + test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp + SNMP_LIBDIR=/usr/local/lib + else + SNMP_INCDIR=$withval/include + test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp + SNMP_LIBDIR=$withval/lib + fi + SNMP_INCLUDE=-I$SNMP_INCDIR + SNMP_LFLAGS=-L$SNMP_LIBDIR + SNMP_LIBS="-lsnmp" + + AC_DEFINE(HAVE_SNMP) + + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ],[ + AC_MSG_RESULT(no) + ]) + AC_SUBST(SNMP_LIBS) + AC_SUBST(SNMP_LFLAGS) + AC_SUBST(SNMP_INCLUDE) AC_MSG_CHECKING(for Velocis support) AC_ARG_WITH(velocis, Index: php3/control_structures_inline.h diff -c php3/control_structures_inline.h:1.186 php3/control_structures_inline.h:1.187 *** php3/control_structures_inline.h:1.186 Thu Sep 10 19:56:53 1998 --- php3/control_structures_inline.h Fri Sep 18 12:55:00 1998 *************** *** 29,35 **** */ ! /* $Id: control_structures_inline.h,v 1.186 1998/09/10 23:56:53 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: control_structures_inline.h,v 1.187 1998/09/18 16:55:00 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 671,677 **** GLOBAL(shutdown_requested) = ABNORMAL_SHUTDOWN; } if (expr) { ! print_variable(expr); pval_destructor(expr); } } --- 671,677 ---- GLOBAL(shutdown_requested) = ABNORMAL_SHUTDOWN; } if (expr) { ! php3i_print_variable(expr); pval_destructor(expr); } } Index: php3/language-parser.y diff -c php3/language-parser.y:1.173 php3/language-parser.y:1.174 *** php3/language-parser.y:1.173 Thu Sep 10 19:56:54 1998 --- php3/language-parser.y Fri Sep 18 12:55:00 1998 *************** *** 31,37 **** */ ! /* $Id: language-parser.y,v 1.173 1998/09/10 23:56:54 zeev Exp $ */ /* --- 31,37 ---- */ ! /* $Id: language-parser.y,v 1.174 1998/09/18 16:55:00 rasmus Exp $ */ /* *************** *** 468,475 **** echo_expr_list: /* empty */ ! | echo_expr_list ',' expr { if (GLOBAL(Execute)) { print_variable(&$3 _INLINE_TLS); pval_destructor(&$3 _INLINE_TLS); } } ! | expr { if (GLOBAL(Execute)) { print_variable(&$1 _INLINE_TLS); pval_destructor(&$1 _INLINE_TLS); } } ; --- 468,475 ---- echo_expr_list: /* empty */ ! | echo_expr_list ',' expr { if (GLOBAL(Execute)) { php3i_print_variable(&$3 _INLINE_TLS); pval_destructor(&$3 _INLINE_TLS); } } ! | expr { if (GLOBAL(Execute)) { php3i_print_variable(&$1 _INLINE_TLS); pval_destructor(&$1 _INLINE_TLS); } } ; *************** *** 554,560 **** | scalar { if (GLOBAL(Execute)) $$ = $1; } | PHP_ARRAY '(' array_pair_list ')' { if (GLOBAL(Execute)) $$ = $3; } | '' encaps_list '' { cs_system(&$$,&$2 _INLINE_TLS); } ! | PHP_PRINT expr { if (GLOBAL(Execute)) { print_variable(&$2 _INLINE_TLS); pval_destructor(&$2 _INLINE_TLS); $$.value.lval=1; $$.type=IS_LONG; } } ; scalar: --- 554,560 ---- | scalar { if (GLOBAL(Execute)) $$ = $1; } | PHP_ARRAY '(' array_pair_list ')' { if (GLOBAL(Execute)) $$ = $3; } | '' encaps_list '' { cs_system(&$$,&$2 _INLINE_TLS); } ! | PHP_PRINT expr { if (GLOBAL(Execute)) { php3i_print_variable(&$2 _INLINE_TLS); pval_destructor(&$2 _INLINE_TLS); $$.value.lval=1; $$.type=IS_LONG; } } ; scalar: Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.11 php3/libphp3.module.in:1.12 *** php3/libphp3.module.in:1.11 Sun Aug 9 15:05:32 1998 --- php3/libphp3.module.in Fri Sep 18 12:55:01 1998 *************** *** 2,8 **** ConfigStart RULE_WANTHSREGEX=@HSREGEX@ SUBVERSION="$SUBVERSION PHP/@PHP_VERSION@" ! 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@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 2,8 ---- ConfigStart RULE_WANTHSREGEX=@HSREGEX@ SUBVERSION="$SUBVERSION PHP/@PHP_VERSION@" ! 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 Index: php3/variables.c diff -c php3/variables.c:1.154 php3/variables.c:1.155 *** php3/variables.c:1.154 Thu Sep 10 19:56:57 1998 --- php3/variables.c Fri Sep 18 12:55:01 1998 *************** *** 29,35 **** */ ! /* $Id: variables.c,v 1.154 1998/09/10 23:56:57 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: variables.c,v 1.155 1998/09/18 16:55:01 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 399,405 **** } ! void print_variable(pval *var INLINE_TLS) { convert_to_string(var); if (var->value.str.len==0) { /* optimize away empty strings */ --- 399,405 ---- } ! void php3i_print_variable(pval *var INLINE_TLS) { convert_to_string(var); if (var->value.str.len==0) { /* optimize away empty strings */ Index: php3/variables.h diff -c php3/variables.h:1.50 php3/variables.h:1.51 *** php3/variables.h:1.50 Thu Sep 10 19:56:57 1998 --- php3/variables.h Fri Sep 18 12:55:03 1998 *************** *** 29,35 **** */ ! /* $Id: variables.h,v 1.50 1998/09/10 23:56:57 zeev Exp $ */ #ifndef _VARIABLES_H --- 29,35 ---- */ ! /* $Id: variables.h,v 1.51 1998/09/18 16:55:03 rasmus Exp $ */ #ifndef _VARIABLES_H *************** *** 44,50 **** extern void get_next_array_variable(pval *result, pval *varname); extern int incdec_variable(pval *result, pval *varname, int (*func) (pval *), int post INLINE_TLS); /*not used ?? extern void incdec_class_variable(pval *result, pval *classname, pval *varname, int (*func) (pval *), int post);*/ ! extern void print_variable(pval *var INLINE_TLS); extern int is_not_internal_function(pval *pvalue); extern void array_assign_next(pval *result, pval *varname, pval *expr); extern void add_array_pair_list(pval *result, pval *idx, pval *value, int initialize INLINE_TLS); --- 44,50 ---- extern void get_next_array_variable(pval *result, pval *varname); extern int incdec_variable(pval *result, pval *varname, int (*func) (pval *), int post INLINE_TLS); /*not used ?? extern void incdec_class_variable(pval *result, pval *classname, pval *varname, int (*func) (pval *), int post);*/ ! extern void php3i_print_variable(pval *var INLINE_TLS); extern int is_not_internal_function(pval *pvalue); extern void array_assign_next(pval *result, pval *varname, pval *expr); extern void add_array_pair_list(pval *result, pval *idx, pval *value, int initialize INLINE_TLS); -- 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