Imported Upstream version 5.3.9upstream/5.3.9

11 files changed, 37 insertions, 33 deletions

diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index 92df8fe40..609781eab 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_blobs.c 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: ibase_blobs.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index a8fa86fa3..1a4975797 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_events.c 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: ibase_events.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index b72721631..6fdac8650 100644
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_query.c 313447 2011-07-19 20:25:51Z mariuz $ */
+/* $Id: ibase_query.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index b02d2156c..e8817e8f1 100644
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_service.c 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: ibase_service.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index a1bed0157..183398fab 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c 313830 2011-07-28 10:39:19Z pajoye $ */
+/* $Id: interbase.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 071d9447f..07b24bbf6 100755
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_includes.h 311341 2011-05-22 19:06:21Z felipe $ */
+/* $Id: php_ibase_includes.h 321634 2012-01-01 13:15:04Z felipe $ */
 
 #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 fac8bbe61..b90514601 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_udf.c 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: php_ibase_udf.c 321634 2012-01-01 13:15:04Z felipe $ */
 
 /**
 * 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 a93fb9a7c..10bbd4d0a 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_interbase.h 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: php_interbase.h 321634 2012-01-01 13:15:04Z felipe $ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index 4be516701..bc4338ad4 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 160078 2004-05-30 16:20:25Z abies $ */
+<?php /* $Id: 003.phpt 321992 2012-01-10 05:26:20Z mariuz $ */
 
     require("interbase.inc");
     ibase_connect($test_base);
@@ -21,7 +21,7 @@ InterBase: misc sql types (may take a while)
    	 		v_numeric15_0  	numeric(15,0),
             v_double  	double precision,
             v_float     float,
-    		v_integer   integer,
+            v_integer   integer,
             v_smallint  smallint,
             v_varchar   varchar(10000)
             )");
@@ -157,27 +157,27 @@ array(22) {
   int(10)
   ["ID_10"]=>
   int(11)
-  ["FIELD_00"]=>
+  ["CONSTANT"]=>
   int(12)
-  ["FIELD_01"]=>
+  ["CONSTANT_01"]=>
   int(13)
-  ["FIELD_02"]=>
+  ["CONSTANT_02"]=>
   int(14)
-  ["FIELD_03"]=>
+  ["CONSTANT_03"]=>
   int(15)
-  ["FIELD_04"]=>
+  ["CONSTANT_04"]=>
   int(16)
-  ["FIELD_05"]=>
+  ["CONSTANT_05"]=>
   int(17)
-  ["FIELD_06"]=>
+  ["CONSTANT_06"]=>
   int(18)
-  ["FIELD_07"]=>
+  ["CONSTANT_07"]=>
   int(19)
-  ["FIELD_08"]=>
+  ["CONSTANT_08"]=>
   int(20)
-  ["FIELD_09"]=>
+  ["CONSTANT_09"]=>
   int(21)
-  ["FIELD_10"]=>
+  ["CONSTANT_10"]=>
   int(22)
 }
 end of test
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index 2aeb0739d..331d2437f 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 160078 2004-05-30 16:20:25Z abies $ */
+<?php /* $Id: 006.phpt 316521 2011-09-12 09:56:45Z mariuz $ */
 
 	require("interbase.inc");
 	
@@ -210,7 +210,7 @@ InterBase: binding (may take a while)
 	out_result($res, "test6");
 	ibase_free_result($res);
 
-	$res = ibase_execute($query, "5", 7.5);
+	$res = ibase_execute($query, "5", 7.499);
 	out_result($res, "test6");
 	ibase_free_result($res);
 
diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
index 78c0d5ca3..2430e7ca6 100755
--- a/ext/interbase/tests/skipif.inc
+++ b/ext/interbase/tests/skipif.inc
@@ -1,5 +1,9 @@
-<?php /* $Id: skipif.inc 155152 2004-04-01 16:25:51Z abies $ */
+<?php /* $Id: skipif.inc 317169 2011-09-22 22:07:02Z tyrael $ */
 
-if (!extension_loaded("interbase")) print "skip"; 
+if (!extension_loaded("interbase")) print "skip interbase extension not available";
+require("interbase.inc");
+if(!@ibase_connect($test_base)){
+        die("skip cannot connnect");
+}
 
 ?>