CVS update: php3/functions

Date: Wednesday June 30, 1999 @ 20:03 Author: sas Update of /repository/php3/functions In directory php:/tmp/cvs-serv21288/functions Modified Files: dba_ndbm.c pgsql.c Log Message: * --with-shared-apache works again (for legacy users mostly) This uses RPATHS correctly now * initial try to get 'make test' run in a VPATH environment (test/testphp needs a change, but I don't know awk very well) * avoid name clash on glibc2 systems which have BerkeleyDB installed /usr/include/db1 contains "db.h", breaking dba_db2.c * revert patch for PostgreSQL, should work now fine again * revert HSREGEX patch, I misinterpreted HS for HoSt == system :-( Index: php3/functions/dba_ndbm.c diff -u php3/functions/dba_ndbm.c:1.13 php3/functions/dba_ndbm.c:1.14 --- php3/functions/dba_ndbm.c:1.13 Tue Jun 22 16:25:26 1999 +++ php3/functions/dba_ndbm.c Wed Jun 30 20:03:53 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_ndbm.c,v 1.13 1999/06/22 20:25:26 jimjag Exp $ */ +/* $Id: dba_ndbm.c,v 1.14 1999/07/01 00:03:53 sas Exp $ */ #include "php.h" @@ -36,7 +36,9 @@ #include <fcntl.h> -#if NDBM_DB1_NDBM_H || NDBM_NDBM_H +#if NDBM_DB1_NDBM_H +#include <db1/ndbm.h> +#elif NDBM_NDBM_H #include <ndbm.h> #endif Index: php3/functions/pgsql.c diff -u php3/functions/pgsql.c:1.86 php3/functions/pgsql.c:1.87 --- php3/functions/pgsql.c:1.86 Mon Jun 28 21:24:43 1999 +++ php3/functions/pgsql.c Wed Jun 30 20:03:53 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.86 1999/06/29 01:24:43 sas Exp $ */ +/* $Id: pgsql.c,v 1.87 1999/07/01 00:03:53 sas Exp $ */ #include <stdlib.h> @@ -957,7 +957,6 @@ array_init(return_value); for (i=0,num_fields=PQnfields(pgsql_result); i<num_fields; i++) { char *tmp; - int len; element = PQgetvalue(pgsql_result,row->value.lval,i); if (element) { @@ -974,8 +973,7 @@ add_get_index_stringl(return_value, i, tmp, element_len, (void **) &pval_ptr, 0); field_name = PQfname(pgsql_result, i); - len = strlen(field_name); - _php3_hash_pointer_update(return_value->value.ht, estrndup(field_name, len), len+1, pval_ptr); + _php3_hash_pointer_update(return_value->value.ht, field_name, strlen(field_name) + 1, pval_ptr); } }