diff options
| author | Jani Taskinen <jani@php.net> | 2007-08-10 13:28:12 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-08-10 13:28:12 +0000 |
| commit | a6c2fdb9a5e9a20da5cbe4f4089be153515459a8 (patch) | |
| tree | 436442210b178e7a09a722078d905b7ae10a48cf /ext/sybase | |
| parent | ee8851dfda9c0a77b1b060c6f829042d29b7bc7f (diff) | |
| download | php-git-a6c2fdb9a5e9a20da5cbe4f4089be153515459a8.tar.gz | |
MFB: sync
Diffstat (limited to 'ext/sybase')
| -rw-r--r-- | ext/sybase/config.m4 | 2 | ||||
| -rw-r--r-- | ext/sybase/php_sybase_db.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4 index 8ccd07c629..742a5e62db 100644 --- a/ext/sybase/config.m4 +++ b/ext/sybase/config.m4 @@ -26,6 +26,6 @@ if test "$PHP_SYBASE" != "no"; then [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) AC_DEFINE(DBMFIX,1,[ ]) ], [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) - + PHP_SUBST(SYBASE_SHARED_LIBADD) fi diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c index 4f6bbb0e0e..e7655df0a8 100644 --- a/ext/sybase/php_sybase_db.c +++ b/ext/sybase/php_sybase_db.c @@ -391,7 +391,7 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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 @@ PHP_FUNCTION(sybase_query) 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); |