cvs: /php4/ext/mssql php_mssql.c
| From: | Frank M. Kromann | Date: | Wed, 10 Nov 1999 19:58:38 +0000 |
| Subject: | cvs: /php4/ext/mssql php_mssql.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6118@lists.php.net to get a copy of this message | ||
fmk Wed Nov 10 14:58:38 1999 EDT
Modified files:
/php4/ext/mssql php_mssql.c
Log:
Fixing the use of mssql.textsize in pconnect()
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.1 php4/ext/mssql/php_mssql.c:1.2
--- php4/ext/mssql/php_mssql.c:1.1 Wed Nov 3 15:35:58 1999
+++ php4/ext/mssql/php_mssql.c Wed Nov 10 14:58:07 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.1 1999/11/03 20:35:58 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.2 1999/11/10 19:58:07 fmk Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
@@ -421,14 +421,6 @@
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 @@
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 @@
}
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 */