diff options
author | Zeev Suraski <zeev@php.net> | 1999-07-22 23:54:54 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 1999-07-22 23:54:54 +0000 |
commit | d3e885841358b2b610bc32293e922fe340a842d3 (patch) | |
tree | f01f789477fb00289134193b968884c5f8b9f85d | |
parent | 5bae591f8802e835e58097f1cb0b0d0ee27669ab (diff) | |
download | php-git-d3e885841358b2b610bc32293e922fe340a842d3.tar.gz |
Please add in any changes/bug fixes you've made - we need to keep a details ChangeLog...
-rw-r--r-- | ChangeLog | 12 | ||||
-rwxr-xr-x | buildconf | 2 | ||||
-rw-r--r-- | ext/msql/msql.c | 3 | ||||
-rw-r--r-- | ext/mysql/mysql.c | 1 | ||||
-rw-r--r-- | ext/pgsql/pgsql.c | 6 | ||||
-rw-r--r-- | ext/sybase/sybase-ct.c | 3 | ||||
-rw-r--r-- | ext/sybase/sybase.c | 3 |
7 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000000..02940decc9 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,12 @@ +PHP 4.0 CHANGE LOG ChangeLog +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| + +??? ?? 1999, Version 4.0 Beta 2 +- Added missing E_ error level constants (Zeev, libzend) +- Fixed a bug in sending multiple HTTP Cookies under Apache (Zeev) +- Fixed implicit connect on the MySQL, mSQL, PostgreSQL and Sybase + modules (Zeev) + + +July 19 1999, Version 4.0 Beta 1 +- First public beta of PHP 4.0
\ No newline at end of file @@ -34,7 +34,7 @@ else 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 diff --git a/ext/msql/msql.c b/ext/msql/msql.c index aab491ef36..466df9ee15 100644 --- a/ext/msql/msql.c +++ b/ext/msql/msql.c @@ -450,7 +450,8 @@ static int php3_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { 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; } diff --git a/ext/mysql/mysql.c b/ext/mysql/mysql.c index 3ac465fea6..319addc54e 100644 --- a/ext/mysql/mysql.c +++ b/ext/mysql/mysql.c @@ -587,6 +587,7 @@ static void php3_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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); diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 4f119ab8de..4738a21a93 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -351,15 +351,13 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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 */ PHP_FUNCTION(pgsql_connect) diff --git a/ext/sybase/sybase-ct.c b/ext/sybase/sybase-ct.c index 1d359001ba..aa1d992dae 100644 --- a/ext/sybase/sybase-ct.c +++ b/ext/sybase/sybase-ct.c @@ -602,7 +602,8 @@ static void php3_sybct_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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; } diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index 760335d21e..0b50958ee8 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -473,8 +473,7 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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; |