iliaa Wed Mar 5 23:52:56 2008 UTC
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
MFB: Revert patch for bug #44325
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.173 php-src/ext/mssql/php_mssql.c:1.174
--- php-src/ext/mssql/php_mssql.c:1.173 Tue Mar 4 19:39:33 2008
+++ php-src/ext/mssql/php_mssql.c Wed Mar 5 23:52:56 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.173 2008/03/04 19:39:33 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.174 2008/03/05 23:52:56 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2056,19 +2056,14 @@
/* modify datalen and maxlen according to dbrpcparam documentation */
if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) {
/* variable-length type */
- if (is_null || Z_TYPE_PP(var) == IS_NULL) {
+ if (is_null) {
maxlen=0;
datalen=0;
- } else {
+ }
+ else {
convert_to_string_ex(var);
- datalen = Z_STRLEN_PP(var);
- value = (LPBYTE)Z_STRVAL_PP(var);
- if (!datalen) {
- datalen = 1;
- if (maxlen == -1) {
- maxlen = 1;
- }
- }
+ datalen=Z_STRLEN_PP(var);
+ value=(LPBYTE)Z_STRVAL_PP(var);
}
}
else { /* fixed-length type */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
