fmk Tue Jan 18 01:09:49 2005 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
make the mssql extension work with freetds on win32
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.145&r2=1.146&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.145 php-src/ext/mssql/php_mssql.c:1.146
--- php-src/ext/mssql/php_mssql.c:1.145 Thu Dec 16 16:47:23 2004
+++ php-src/ext/mssql/php_mssql.c Tue Jan 18 01:09:48 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.145 2004/12/16 21:47:23 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.146 2005/01/18 06:09:48 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -468,6 +468,11 @@
#ifndef HAVE_FREETDS
}
#endif
+
+#ifdef HAVE_FREETDS
+ DBSETLCHARSET(mssql.login, "ISO-8859-1");
+#endif
+
DBSETLAPP(mssql.login,MS_SQL_G(appname));
mssql.valid = 1;
@@ -638,6 +643,7 @@
RETURN_FALSE;
}
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, "%li", MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, buffer)==FAIL) {
@@ -647,6 +653,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, "SET TEXTSIZE %li", MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
