From: Frank M. Kromann <fmk@php.net>
Date: Wed, 10 Nov 1999 19:58:07 +0000 (+0000)
Subject: Fixing the use of mssql.textsize in pconnect()
X-Git-Tag: php-4.0b3_RC5~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3581f0d03705e3af7ac56ed3c80db66384c9dd22;p=php

Fixing the use of mssql.textsize in pconnect()
---

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 9ab6d241f2..6e42b03fd6 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -421,14 +421,6 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 				RETURN_FALSE;
 			}
 
-			if (MS_SQL_G(textsize) != -1) {
-				sprintf(buffer, "%li", MS_SQL_G(textsize));
-				if (dbsetopt(mssql.link, DBTEXTSIZE, buffer)==FAIL) {
-					efree(hashed_details);
-					dbfreelogin(mssql.login);
-					RETURN_FALSE;
-				}	
-			}
 			if (MS_SQL_G(textlimit) != -1) {
 				sprintf(buffer, "%li", MS_SQL_G(textlimit));
 				if (dbsetopt(mssql.link, DBTEXTLIMIT, buffer)==FAIL) {
@@ -437,6 +429,12 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 					RETURN_FALSE;
 				}
 			}
+			if (MS_SQL_G(textsize) != -1) {
+				sprintf(buffer, "SET TEXTSIZE %li", MS_SQL_G(textsize));
+				dbcmd(mssql.link, buffer);
+				dbsqlexec(mssql.link);
+				dbresults(mssql.link);
+			}
 
 			/* hash it up */
 			mssql_ptr = (mssql_link *) emalloc(sizeof(mssql_link));
@@ -545,15 +543,9 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		}
 		if (MS_SQL_G(textsize) != -1) {
 			sprintf(buffer, "SET TEXTSIZE %li", MS_SQL_G(textsize));
-
 			dbcmd(mssql.link, buffer);
 			dbsqlexec(mssql.link);
 			dbresults(mssql.link);
-//			if (dbsetopt(mssql.link, DBTEXTSIZE, buffer)==FAIL) {
-//				efree(hashed_details);
-//				dbfreelogin(mssql.login);
-//				RETURN_FALSE;
-//			}	
 		}
 
 		/* add it to the list */