jani Fri Aug 10 13:25:13 2007 UTC
Modified files:
/php-src/ext/sybase config.m4 php_sybase_db.c php_sybase_db.h
Log:
MFB: sync
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/config.m4?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/sybase/config.m4
diff -u php-src/ext/sybase/config.m4:1.13 php-src/ext/sybase/config.m4:1.14
--- php-src/ext/sybase/config.m4:1.13 Tue Jul 3 17:24:37 2007
+++ php-src/ext/sybase/config.m4 Fri Aug 10 13:25:12 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.13 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.14 2007/08/10 13:25:12 jani Exp $
dnl
PHP_ARG_WITH(sybase,for Sybase support,
@@ -26,6 +26,6 @@
[ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ])
AC_DEFINE(DBMFIX,1,[ ]) ],
[ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ])
-
+
PHP_SUBST(SYBASE_SHARED_LIBADD)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.75&r2=1.76&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.75
php-src/ext/sybase/php_sybase_db.c:1.76
--- php-src/ext/sybase/php_sybase_db.c:1.75 Tue May 29 21:06:03 2007
+++ php-src/ext/sybase/php_sybase_db.c Fri Aug 10 13:25:12 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.75 2007/05/29 21:06:03 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.76 2007/08/10 13:25:12 jani Exp $ */
#ifdef HAVE_CONFIG_H
@@ -391,7 +391,7 @@
passwd = Z_STRVAL_PP(yypasswd);
charset = Z_STRVAL_PP(yycharset);
appname = Z_STRVAL_PP(yyappname);
- hashed_details_length =
spprintf(hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost),
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset),
Z_STRVAL_PP(yyappname));
+ hashed_details_length =
spprintf(&hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost),
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset),
Z_STRVAL_PP(yyappname));
}
break;
default:
@@ -839,16 +839,11 @@
while (retvalue!=FAIL && retvalue!=NO_MORE_ROWS) {
result->num_rows++;
if (result->num_rows > blocks_initialized*SYBASE_ROWS_BLOCK) {
- result->data = (zval ***)
erealloc(result->data,sizeof(zval **)*SYBASE_ROWS_BLOCK*(++blocks_initialized));
+ result->data = (zval ***) safe_erealloc(result->data,
SYBASE_ROWS_BLOCK*(++blocks_initialized), sizeof(zval **), 0);
}
result->data[i] = (zval **) safe_emalloc(sizeof(zval *),
num_fields, 0);
for (j=1; j<=num_fields; j++) {
php_sybase_get_column_content(sybase_ptr, j,
&result->data[i][j-1], column_types[j-1]);
- if (!php_sybase_module.compatability_mode) {
- zval *cur_value = result->data[i][j-1];
-
- convert_to_string(cur_value);
- }
}
retvalue=dbnextrow(sybase_ptr->link);
dbclrbuf(sybase_ptr->link,DBLASTROW(sybase_ptr->link)-1);
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.h?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.h
diff -u php-src/ext/sybase/php_sybase_db.h:1.14
php-src/ext/sybase/php_sybase_db.h:1.15
--- php-src/ext/sybase/php_sybase_db.h:1.14 Mon Jan 1 09:29:32 2007
+++ php-src/ext/sybase/php_sybase_db.h Fri Aug 10 13:25:12 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.h,v 1.14 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_sybase_db.h,v 1.15 2007/08/10 13:25:12 jani Exp $ */
#ifndef PHP_SYBASE_DB_H
#define PHP_SYBASE_DB_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
