Fixing the use of mssql.textsize in pconnect()

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 9ab6d241f2d23b36fff18ca04e883ce6534668f3..6e42b03fd679f5599ad2a4fdd22cbcb8f757a40f 100644 (file)
--- 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 */