Imported Upstream version 5.4.1~rc1upstream/5.4.1_rc1

19 files changed, 20 insertions, 19 deletions

diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 96f3fe78c..603145ad6 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
+dnl $Id$
 dnl
 
 PHP_ARG_WITH(interbase,for InterBase support,
diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index 51978e6c3..551212546 100644
--- a/ext/interbase/config.w32
+++ b/ext/interbase/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32 305343 2010-11-14 22:40:30Z pajoye $
+// $Id$
 // vim:ft=javascript
 
 ARG_WITH("interbase", "InterBase support", "no");
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index 609781eab..14ffb2276 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_blobs.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index 1a4975797..909a173db 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_events.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index 06702fa7c..1c6de4e73 100644
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_query.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index e8817e8f1..6faaa564d 100644
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_service.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -321,6 +321,7 @@ query_loop:
 					heap_p = heap_buf + res_size;
 				}
 				result += 2;
+				*(result+line_len) = 0;
 				snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);
 				heap_p += line_len +2;
 				goto query_loop; /* repeat until result is exhausted */
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 4b0472aa9..f401a4d1b 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 07b24bbf6..09f4243a0 100755
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_includes.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifndef PHP_IBASE_INCLUDES_H
 #define PHP_IBASE_INCLUDES_H
diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c
index b90514601..07c1c3182 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_udf.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 /**
 * This UDF library adds the ability to call PHP functions from SQL
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 10bbd4d0a..eeaafe645 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_interbase.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
diff --git a/ext/interbase/tests/002.phpt b/ext/interbase/tests/002.phpt
index 7a367ae22..070a6f006 100644
--- a/ext/interbase/tests/002.phpt
+++ b/ext/interbase/tests/002.phpt
@@ -3,7 +3,7 @@ InterBase: connect, close and pconnect
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 002.phpt 158958 2004-05-19 08:56:50Z helly $ */
+<?php /* $Id$ */
 
 	require("interbase.inc");
     
diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index 43339a314..652e3bdc5 100644
--- a/ext/interbase/tests/003.phpt
+++ b/ext/interbase/tests/003.phpt
@@ -3,7 +3,7 @@ InterBase: misc sql types (may take a while)
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 003.phpt 316505 2011-09-11 20:18:20Z mariuz $ */
+<?php /* $Id$ */
 
     require("interbase.inc");
     ibase_connect($test_base);
diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt
index e6437f441..579445dbd 100644
--- a/ext/interbase/tests/004.phpt
+++ b/ext/interbase/tests/004.phpt
@@ -3,7 +3,7 @@ InterBase: BLOB test
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 004.phpt 158958 2004-05-19 08:56:50Z helly $ */
+<?php /* $Id$ */
 
     require("interbase.inc");
     
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index e3292805c..5b16ac291 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -3,7 +3,7 @@ InterBase: transactions
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 005.phpt 158958 2004-05-19 08:56:50Z helly $ */
+<?php /* $Id$ */
 
     require("interbase.inc");
     
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index 50e7bb9de..ad6120f39 100644
--- a/ext/interbase/tests/006.phpt
+++ b/ext/interbase/tests/006.phpt
@@ -3,7 +3,7 @@ InterBase: binding (may take a while)
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 006.phpt 316515 2011-09-12 09:36:37Z mariuz $ */
+<?php /* $Id$ */
 
 	require("interbase.inc");
 	
diff --git a/ext/interbase/tests/007.phpt b/ext/interbase/tests/007.phpt
index f53d67c10..069b7eda2 100644
--- a/ext/interbase/tests/007.phpt
+++ b/ext/interbase/tests/007.phpt
@@ -3,7 +3,7 @@ InterBase: array handling
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
-<?php /* $Id: 007.phpt 160078 2004-05-30 16:20:25Z abies $ */
+<?php /* $Id$ */
 
 	require("interbase.inc");
 	
diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt
index 627d77d1a..8292fc38c 100755
--- a/ext/interbase/tests/008.phpt
+++ b/ext/interbase/tests/008.phpt
@@ -6,7 +6,7 @@ if (PHP_OS == "WINNT") echo "skip";
 include("skipif.inc"); 
 ?>
 --FILE--
-<?php /* $Id: 008.phpt 158958 2004-05-19 08:56:50Z helly $ */
+<?php /* $Id$ */
 
 require("interbase.inc");
 
diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc
index 7e567ff19..42eb6e591 100755
--- a/ext/interbase/tests/interbase.inc
+++ b/ext/interbase/tests/interbase.inc
@@ -1,4 +1,4 @@
-<?php /* $Id: interbase.inc 267053 2008-10-07 12:51:21Z felipe $ */
+<?php /* $Id$ */
 
 srand((double)microtime()*1000000);
 
diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
index 2430e7ca6..79813f69e 100755
--- a/ext/interbase/tests/skipif.inc
+++ b/ext/interbase/tests/skipif.inc
@@ -1,4 +1,4 @@
-<?php /* $Id: skipif.inc 317169 2011-09-22 22:07:02Z tyrael $ */
+<?php /* $Id$ */
 
 if (!extension_loaded("interbase")) print "skip interbase extension not available";
 require("interbase.inc");