summaryrefslogtreecommitdiff
path: root/ext/mssql
diff options
context:
space:
mode:
authorFrank M. Kromann <fmk@php.net>1999-11-10 19:58:07 +0000
committerFrank M. Kromann <fmk@php.net>1999-11-10 19:58:07 +0000
commit3581f0d03705e3af7ac56ed3c80db66384c9dd22 (patch)
treebae2d1662fb7c9c4d4e009d8d622e1f3d9cfabaf /ext/mssql
parent7a4e1a9b0f854c990c2e39541a7778de68a2e485 (diff)
downloadphp-git-3581f0d03705e3af7ac56ed3c80db66384c9dd22.tar.gz
Fixing the use of mssql.textsize in pconnect()
Diffstat (limited to 'ext/mssql')
-rw-r--r--ext/mssql/php_mssql.c20
1 files changed, 6 insertions, 14 deletions
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 */