Please add in any changes/bug fixes you've made - we need to keep a details ChangeLog...

zsuraski · zsuraski · commit d3e885841358 · 1999-07-22T23:54:54.000Z
diff --git a/ChangeLog 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
diff --git a/buildconf b/buildconf
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,8 @@ static int php3_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`450`	`450`	`{`
`451`	`451`	`MSQL_TLS_VARS;`
`452`	`452`	`if (MSQL_GLOBAL(php3_msql_module).default_link==-1) { /* no link opened yet, implicitly open one */`
`453`		`- php3_msql_do_connect(0, return_value, list, plist, this_ptr,0);`
	`453`	`+ ht = 0;`
	`454`	`+ php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`454`	`455`	`}`
`455`	`456`	`return MSQL_GLOBAL(php3_msql_module).default_link;`
`456`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,6 +587,7 @@ static void php3_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`587`	`587`	`static int php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MySLS_DC)`
`588`	`588`	`{`
`589`	`589`	`if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */`
	`590`	`+ ht = 0;`
`590`	`591`	`php3_mysql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`591`	`592`	`}`
`592`	`593`	`return MySG(default_link);`
Original file line number	Diff line number	Diff line change
`@@ -351,15 +351,13 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`351`	`351`	`int php3_pgsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`352`	`352`	`{`
`353`	`353`	`if (php3_pgsql_module.default_link==-1) { /* no link opened yet, implicitly open one */`
`354`		`- HashTable tmp;`
`355`		`-`
`356`		`- _php3_hash_init(&tmp,0,NULL,NULL,0);`
	`354`	`+ ht = 0;`
`357`	`355`	`php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);`
`358`		`- _php3_hash_destroy(&tmp);`
`359`	`356`	`}`
`360`	`357`	`return php3_pgsql_module.default_link;`
`361`	`358`	`}`
`362`	`359`
	`360`	`+`
`363`	`361`	`/* {{{ proto int pg_connect([string connection_string] \| [string host, string port, [string options, [string tty,]] string database)`
`364`	`362`	`Open a PostgreSQL connection */`
`365`	`363`	`PHP_FUNCTION(pgsql_connect)`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,8 @@ static void php3_sybct_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`602`	`602`	`static int php3_sybct_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`603`	`603`	`{`
`604`	`604`	`if (php3_sybct_module.default_link==-1) { /* no link opened yet, implicitly open one */`
`605`		`- php3_sybct_do_connect(0,return_value,list,plist,0);`
	`605`	`+ ht = 0;`
	`606`	`+ php3_sybct_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`606`	`607`	`}`
`607`	`608`	`return php3_sybct_module.default_link;`
`608`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -473,8 +473,7 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`473`	`473`	`static int php3_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`474`	`474`	`{`
`475`	`475`	`if (php3_sybase_module.default_link==-1) { /* no link opened yet, implicitly open one */`
`476`		`- int ht;`
`477`		`-`
	`476`	`+ ht = 0;`
`478`	`477`	`php3_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);`
`479`	`478`	`}`
`480`	`479`	`return php3_sybase_module.default_link;`