cvs: /php4 ChangeLog buildconf /php4/ext/msql msql.c /php4/ext/mysql mysql.c /php4/ext/pgsql pgsql.c /php4/ext/sybase sybase-ct.c sybase.c

zeev Thu Jul 22 19:54:55 1999 EDT Modified files: /php4 ChangeLog buildconf /php4/ext/msql msql.c /php4/ext/mysql mysql.c /php4/ext/pgsql pgsql.c /php4/ext/sybase sybase-ct.c sybase.c Log: Please add in any changes/bug fixes you've made - we need to keep a details ChangeLog... Index: php4/buildconf diff -u php4/buildconf:1.15 php4/buildconf:1.16 --- php4/buildconf:1.15 Thu Jul 22 16:21:07 1999 +++ php4/buildconf Thu Jul 22 19:54:53 1999 @@ -34,7 +34,7 @@ fi IFS=.; set $am_version; IFS=' ' if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then - echo "buildconf: automake version $ac_version found." + echo "buildconf: automake version $am_version found." echo " You need automake version 1.4 or newer installed" echo " to build PHP from CVS." exit 1 Index: php4/ext/msql/msql.c diff -u php4/ext/msql/msql.c:1.11 php4/ext/msql/msql.c:1.12 --- php4/ext/msql/msql.c:1.11 Mon Jul 19 15:10:11 1999 +++ php4/ext/msql/msql.c Thu Jul 22 19:54:54 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: msql.c,v 1.11 1999/07/19 19:10:11 eschmid Exp $ */ +/* $Id: msql.c,v 1.12 1999/07/22 23:54:54 zeev Exp $ */ #include "php.h" #if COMPILE_DL @@ -450,7 +450,8 @@ { MSQL_TLS_VARS; if (MSQL_GLOBAL(php3_msql_module).default_link==-1) { /* no link opened yet, implicitly open one */ - php3_msql_do_connect(0, return_value, list, plist, this_ptr,0); + ht = 0; + php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } return MSQL_GLOBAL(php3_msql_module).default_link; } Index: php4/ext/mysql/mysql.c diff -u php4/ext/mysql/mysql.c:1.14 php4/ext/mysql/mysql.c:1.15 --- php4/ext/mysql/mysql.c:1.14 Mon Jul 19 16:09:05 1999 +++ php4/ext/mysql/mysql.c Thu Jul 22 19:54:54 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql.c,v 1.14 1999/07/19 20:09:05 eschmid Exp $ */ +/* $Id: mysql.c,v 1.15 1999/07/22 23:54:54 zeev Exp $ */ /* TODO: @@ -587,6 +587,7 @@ static int php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MySLS_DC) { if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */ + ht = 0; php3_mysql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } return MySG(default_link); Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.10 php4/ext/pgsql/pgsql.c:1.11 --- php4/ext/pgsql/pgsql.c:1.10 Mon Jul 19 16:37:17 1999 +++ php4/ext/pgsql/pgsql.c Thu Jul 22 19:54:54 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.10 1999/07/19 20:37:17 eschmid Exp $ */ +/* $Id: pgsql.c,v 1.11 1999/07/22 23:54:54 zeev Exp $ */ #include <stdlib.h> @@ -351,14 +351,12 @@ int php3_pgsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (php3_pgsql_module.default_link==-1) { /* no link opened yet, implicitly open one */ - HashTable tmp; - - _php3_hash_init(&tmp,0,NULL,NULL,0); + ht = 0; php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); - _php3_hash_destroy(&tmp); } return php3_pgsql_module.default_link; } + /* {{{ proto int pg_connect([string connection_string] | [string host, string port, [string options, [string tty,]] string database) Open a PostgreSQL connection */ Index: php4/ext/sybase/sybase-ct.c diff -u php4/ext/sybase/sybase-ct.c:1.7 php4/ext/sybase/sybase-ct.c:1.8 --- php4/ext/sybase/sybase-ct.c:1.7 Wed Jul 21 04:55:19 1999 +++ php4/ext/sybase/sybase-ct.c Thu Jul 22 19:54:54 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase-ct.c,v 1.7 1999/07/21 08:55:19 sas Exp $ */ +/* $Id: sybase-ct.c,v 1.8 1999/07/22 23:54:54 zeev Exp $ */ #include "php.h" @@ -602,7 +602,8 @@ static int php3_sybct_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (php3_sybct_module.default_link==-1) { /* no link opened yet, implicitly open one */ - php3_sybct_do_connect(0,return_value,list,plist,0); + ht = 0; + php3_sybct_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } return php3_sybct_module.default_link; } Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.8 php4/ext/sybase/sybase.c:1.9 --- php4/ext/sybase/sybase.c:1.8 Fri Jul 16 18:00:51 1999 +++ php4/ext/sybase/sybase.c Thu Jul 22 19:54:54 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.8 1999/07/16 22:00:51 zeev Exp $ */ +/* $Id: sybase.c,v 1.9 1999/07/22 23:54:54 zeev Exp $ */ #ifndef MSVC5 @@ -473,8 +473,7 @@ static int php3_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (php3_sybase_module.default_link==-1) { /* no link opened yet, implicitly open one */ - int ht; - + ht = 0; php3_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); } return php3_sybase_module.default_link;