iliaa           Tue Oct 14 23:32:18 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/mssql  php_mssql.c 
  Log:
  MFH: Fixed bug #25777 (Do not rtrim() of text fields fetched from mssql).
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.437 php-src/NEWS:1.1247.2.438
--- php-src/NEWS:1.1247.2.437   Tue Oct 14 20:14:36 2003
+++ php-src/NEWS        Tue Oct 14 23:32:16 2003
@@ -12,6 +12,7 @@
 - Fixed bug #25800 (parse_url() could not parse urls with empty port). (Ilia)
 - Fixed bug #25780 (ext/session: invalid "session.cookie_lifetime" makes 
   session_start() to crash in win32). (Jani)
+- Fixed bug #25777 (Do not rtrim() of text fields fetched from mssql). (Ilia)
 - Fixed bug #25770 (Segfault with PHP and bison 1.875). ([EMAIL PROTECTED], Marcus)
 - Fixed bug #25764 (ldap_get_option() crashes with unbound ldap link). (Jani)
 - Fixed bug #25758 (var_export does not escape ' & \ inside array keys). (Ilia)
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.24 php-src/ext/mssql/php_mssql.c:1.86.2.25
--- php-src/ext/mssql/php_mssql.c:1.86.2.24     Thu Aug 28 16:01:29 2003
+++ php-src/ext/mssql/php_mssql.c       Tue Oct 14 23:32:18 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_mssql.c,v 1.86.2.24 2003/08/28 20:01:29 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.25 2003/10/15 03:32:18 iliaa Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -784,9 +784,11 @@
                        char *data = charcol(offset);
 
                        length=dbdatlen(mssql_ptr->link,offset);
+#if ilia_0
                        while (length>0 && data[length-1] == ' ') { /* nuke trailing 
whitespace */
                                length--;
                        }
+#endif
                        Z_STRVAL_P(result) = estrndup(data,length);
                        Z_STRLEN_P(result) = length;
                        Z_TYPE_P(result) = IS_STRING;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to