MFB: sync

12 files changed, 18 insertions, 23 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); 
diff --git a/ext/sybase_ct/tests/bug22403.phpt b/ext/sybase_ct/tests/bug22403.phpt
index 2088595d33..20d5248ff4 100644
--- a/ext/sybase_ct/tests/bug22403.phpt
+++ b/ext/sybase_ct/tests/bug22403.phpt
@@ -17,7 +17,7 @@ Sybase-CT bug #22403 (crash when executing a stored procedure without parameters
 
   // Check if stored procedure already exists
   $sp_name= 'phpt_bug22403';
-  var_dump(sybase_select_db('tempdb', $db));
+  var_dump(sybase_select_db(TEMPDB, $db));
   if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
     echo "Stored procedure {$sp_name} not found, creating\n";
     var_dump(sybase_query('
@@ -63,7 +63,7 @@ bool(false)
 <<< Return: boolean
 bool(false)
 >>> Query: exec does_not_exist
-*** Caught Sybase Server Message #2812 [Severity 16, state 4] at line 1
+*** Caught Sybase Server Message #2812 [Severity 16, state %d] at line 1
     %s
 <<< Return: boolean
 bool(false)
diff --git a/ext/sybase_ct/tests/bug26407.phpt b/ext/sybase_ct/tests/bug26407.phpt
index c8a2d8f28f..35bf6df7ad 100644
--- a/ext/sybase_ct/tests/bug26407.phpt
+++ b/ext/sybase_ct/tests/bug26407.phpt
@@ -80,7 +80,7 @@ bool(true)
     select "bar"   
   
 
-Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %s/test.inc on line %d
+Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %stest.inc on line %d
 <<< Return: resource
 array(1) {
   [0]=>
diff --git a/ext/sybase_ct/tests/bug27843.phpt b/ext/sybase_ct/tests/bug27843.phpt
index 2de4dbb2ff..861d1f95e7 100644
--- a/ext/sybase_ct/tests/bug27843.phpt
+++ b/ext/sybase_ct/tests/bug27843.phpt
@@ -15,7 +15,7 @@ Sybase-CT bug #27843 (notices when query is a stored procedure)
 
   // Check if stored procedure already exists
   $sp_name= 'phpt_bug27843';
-  var_dump(sybase_select_db('tempdb', $db));
+  var_dump(sybase_select_db(TEMPDB, $db));
   if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
     echo "Stored procedure {$sp_name} not found, creating\n";
     var_dump(sybase_query('
diff --git a/ext/sybase_ct/tests/bug28354.phpt b/ext/sybase_ct/tests/bug28354.phpt
index 3ef374469a..018f7bddec 100644
--- a/ext/sybase_ct/tests/bug28354.phpt
+++ b/ext/sybase_ct/tests/bug28354.phpt
@@ -17,7 +17,7 @@ Sybase-CT bug #28354 (sybase_free_result crash)
 
   // Check if stored procedure already exists
   $sp_name= 'phpt_bug28354';
-  var_dump(sybase_select_db('tempdb', $db));
+  var_dump(sybase_select_db(TEMPDB, $db));
   if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
     echo "Stored procedure {$sp_name} not found, creating\n";
     var_dump(sybase_query('
diff --git a/ext/sybase_ct/tests/test.inc b/ext/sybase_ct/tests/test.inc
index 63bc85f26a..d9a587f040 100644
--- a/ext/sybase_ct/tests/test.inc
+++ b/ext/sybase_ct/tests/test.inc
@@ -8,6 +8,7 @@
   define('HOST',     '****');
   define('USER',     '****');
   define('PASSWORD', '****');
+  define('TEMPDB',   'tempdb');
 
   // {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int line, string text)
   //     Handles server messages
@@ -78,8 +79,8 @@
   // {{{ mixed sybase_select_single(resource dbh, string query)
   //     Fires an SQL query and returns the first value from the first row
   function sybase_select_single($dbh, $query) {
-	$a = sybase_fetch_row(sybase_query($query, $dbh));
-	return array_shift($a);
+    $a = sybase_fetch_row(sybase_query($query, $dbh));
+    return array_shift($a);
   }
   // }}}
 ?>
diff --git a/ext/sybase_ct/tests/test_fetch_object.phpt b/ext/sybase_ct/tests/test_fetch_object.phpt
index 699c9335cc..c23658fa35 100644
--- a/ext/sybase_ct/tests/test_fetch_object.phpt
+++ b/ext/sybase_ct/tests/test_fetch_object.phpt
@@ -65,7 +65,7 @@ article::__set_state(array(
    'lastchange' => '%s',
 ))
 
-Notice: sybase_fetch_object(): Sybase:  Class *** has not been declared in %s/test_fetch_object.php on line %d
+Notice: sybase_fetch_object(): Sybase:  Class *** has not been declared in %stest_fetch_object.php on line %d
 stdClass::__set_state(array(
    'id' => 1,
    'caption' => 'Hello',
diff --git a/ext/sybase_ct/tests/test_long.phpt b/ext/sybase_ct/tests/test_long.phpt
index 9f940d8efd..de59bb93cb 100644
--- a/ext/sybase_ct/tests/test_long.phpt
+++ b/ext/sybase_ct/tests/test_long.phpt
@@ -15,7 +15,7 @@ Sybase-CT select LONG_MAX / LONG_MIN
   define('LONG_MIN', -LONG_MAX - 1);
 
   $db= sybase_connect_ex();
-  var_dump(sybase_select_db('tempdb', $db));
+  var_dump(sybase_select_db(TEMPDB, $db));
   
   // Create table and insert some values
   var_dump(sybase_query('create table test_long (value numeric(20, 0))'));
diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index 742dc684ad..d97fe3f76c 100644
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -26,14 +26,14 @@ Sybase-CT server message handler
 ?>
 --EXPECTF--
 Nonexistant:     
-Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %stest.inc on line %d
 bool(false)
 Static method:   bool(true)
 Instance method: bool(true)
 Lambda function: bool(true)
 Unset:           bool(true)
 Incorrect type:  
-Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %stest.inc on line %d
 bool(false)
 Function:        bool(true)
 >>> Query: select getdate(NULL)
diff --git a/ext/sybase_ct/tests/test_msghandler_handled.phpt b/ext/sybase_ct/tests/test_msghandler_handled.phpt
index 9c4fcb3b4b..5952c3b00b 100644
--- a/ext/sybase_ct/tests/test_msghandler_handled.phpt
+++ b/ext/sybase_ct/tests/test_msghandler_handled.phpt
@@ -65,6 +65,5 @@ Cannot handle message #249
 
 Warning: sybase_query(): Sybase:  Server message:  Syntax error during explicit conversion of VARCHAR value 'notadate' to a DATETIME field.
  (severity 16, procedure N/A) in %s on line %d
-<<< Return: resource
-array(0) {
-}
+<<< Return: boolean
+bool(false)
diff --git a/ext/sybase_ct/tests/test_unbuffered_query.phpt b/ext/sybase_ct/tests/test_unbuffered_query.phpt
index 74b10143b2..b2be2f2304 100644
--- a/ext/sybase_ct/tests/test_unbuffered_query.phpt
+++ b/ext/sybase_ct/tests/test_unbuffered_query.phpt
@@ -49,7 +49,7 @@ bool(true)
 resource(%d) of type (sybase-ct result)
 resource(%d) of type (Unknown)
 
-Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %s/test_unbuffered_query.php on line %d
+Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %stest_unbuffered_query.php on line %d
 bool(true)
 resource(%d) of type (sybase-ct result)
 int(%d)