Imported Upstream version 5.3.1upstream/5.3.1

20 files changed, 103 insertions, 104 deletions

diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index b1f812a92..96f3fe78c 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.20.6.2 2007/07/31 13:02:00 jani Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
 dnl
 
 PHP_ARG_WITH(interbase,for InterBase support,
diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index e5933bbd9..357220bef 100644
--- a/ext/interbase/config.w32
+++ b/ext/interbase/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2004/05/12 14:29:42 abies Exp $
+// $Id: config.w32 158415 2004-05-12 14:29:42Z abies $
 // vim:ft=javascript
 
 ARG_WITH("interbase", "InterBase support", "no");
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index 669eac682..bbbddbd8d 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_blobs.c,v 1.9.2.1.2.3.2.2 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: ibase_blobs.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index 04deef397..51ff0ccff 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_events.c,v 1.8.2.1.2.1.2.6 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: ibase_events.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index bf83facdd..6ef830144 100644
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_query.c,v 1.23.2.1.2.10.2.10 2009/01/11 23:52:29 iliaa Exp $ */
+/* $Id: ibase_query.c 286330 2009-07-25 23:37:47Z kalle $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1031,8 +1031,7 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
 				if (affected_rows) {
 					RETVAL_LONG(affected_rows);
 				} else {
-					/* this return value evaluates to bool(true) and to int(0) */
-					RETVAL_STRINGL("0 ",2,1);
+					RETVAL_TRUE;
 				}
 				break;
 			}
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index 4b86a4dee..0801afccd 100644
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.5.2.3 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: ibase_service.c 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 44b3da2b8..054c4abd6 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c,v 1.225.2.4.2.7.2.11 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: interbase.c 284159 2009-07-16 00:04:59Z rasmus $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -861,8 +861,8 @@ static char const dpb_args[] = {
 	
 int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db TSRMLS_DC)
 {
-	short i, dpb_len, buf_len = 256;
-	char dpb_buffer[256] = { isc_dpb_version1 }, *dpb;
+	short i, dpb_len, buf_len = 257-2;  /* version byte at the front, and a null at the end */
+	char dpb_buffer[257] = { isc_dpb_version1, 0 }, *dpb;
 
 	dpb = dpb_buffer + 1;
 
diff --git a/ext/interbase/interbase.rc b/ext/interbase/interbase.rc
index b5e3f755c..a42bb3f68 100644
--- a/ext/interbase/interbase.rc
+++ b/ext/interbase/interbase.rc
@@ -1,81 +1,81 @@
-/*

-   +----------------------------------------------------------------------+

-   | PHP Version 5                                                        |

-   +----------------------------------------------------------------------+

-   | Copyright (c) 1997-2007 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        |

-   | available through the world-wide-web at the following url:           |

-   | http://www.php.net/license/3_01.txt                                  |

-   | If you did not receive a copy of the PHP license and are unable to   |

-   | obtain it through the world-wide-web, please send a note to          |

-   | license@php.net so we can mail you a copy immediately.               |

-   +----------------------------------------------------------------------+

-   | Author:  Ard Biesheuvel <a.k.biesheuvel@its.tudelft.nl>              |

-   +----------------------------------------------------------------------+

- */

-

-/* $Id: interbase.rc,v 1.7.2.1.2.1 2007/01/01 19:32:10 iliaa Exp $ */

-

-#ifdef APSTUDIO_INVOKED

-#error This file cannot be opened from the Visual Studio IDE

-#endif

-

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-#include "winres.h"

-#undef APSTUDIO_READONLY_SYMBOLS

-

-#include "php_version.h"

-

-#ifdef _DEBUG

-# define BUILD_TYPE "Debug"

-#else

-# define BUILD_TYPE "Release"

-#endif

-

-#include <ibase.h>

-#include "interbase.c"

-

-#ifdef FB_SQLDA

-#define CLIENT_LIB "fbclient.dll"

-#else

-#define CLIENT_LIB "gds32.dll"

-#endif

-

-#ifndef _MAC

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0

- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0

-#ifndef _DEBUG

- FILEFLAGS 0x0L

-#else

- FILEFLAGS 0x1L

-#endif

- FILEFLAGSMASK 0x3fL

- FILEOS VOS__WINDOWS32

- FILETYPE VFT_DLL

- FILESUBTYPE VFT2_UNKNOWN

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "FileDescription", "PHP Interbase module\0"

-            VALUE "FileVersion", PHP_VERSION "\0"

-            VALUE "LegalCopyright", "Copyright © 2003 The PHP Group\0"

-			VALUE "Build Type", BUILD_TYPE "\0"

-            VALUE "Client Library", CLIENT_LIB "\0"

-			VALUE "URL", "http://www.php.net\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // !_MAC

+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2007 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        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author:  Ard Biesheuvel <a.k.biesheuvel@its.tudelft.nl>              |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id: interbase.rc 242949 2007-09-26 15:44:16Z cvs2svn $ */
+
+#ifdef APSTUDIO_INVOKED
+#error This file cannot be opened from the Visual Studio IDE
+#endif
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#include "php_version.h"
+
+#ifdef _DEBUG
+# define BUILD_TYPE "Debug"
+#else
+# define BUILD_TYPE "Release"
+#endif
+
+#include <ibase.h>
+#include "interbase.c"
+
+#ifdef FB_SQLDA
+#define CLIENT_LIB "fbclient.dll"
+#else
+#define CLIENT_LIB "gds32.dll"
+#endif
+
+#ifndef _MAC
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+#ifndef _DEBUG
+ FILEFLAGS 0x0L
+#else
+ FILEFLAGS 0x1L
+#endif
+ FILEFLAGSMASK 0x3fL
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "FileDescription", "PHP Interbase module\0"
+            VALUE "FileVersion", PHP_VERSION "\0"
+            VALUE "LegalCopyright", "Copyright © 2003 The PHP Group\0"
+			VALUE "Build Type", BUILD_TYPE "\0"
+            VALUE "Client Library", CLIENT_LIB "\0"
+			VALUE "URL", "http://www.php.net\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // !_MAC
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 3d9f4e3ef..4f0216420 100755
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_includes.h,v 1.16.2.1.2.1.2.3 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: php_ibase_includes.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #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 f671e0986..2816e950c 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_udf.c,v 1.9.2.1.2.2.2.4 2009/06/05 18:50:32 mattwil Exp $ */
+/* $Id: php_ibase_udf.c 281727 2009-06-05 18:50:32Z mattwil $ */
 
 /**
 * 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 dbb86e9e6..785cee865 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_interbase.h,v 1.71.2.1.2.1.2.2 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: php_interbase.h 272370 2008-12-31 11:15:49Z sebastian $ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
diff --git a/ext/interbase/tests/002.phpt b/ext/interbase/tests/002.phpt
index a255d1a1d..7a367ae22 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,v 1.6 2004/05/19 08:54:52 helly Exp $ */
+<?php /* $Id: 002.phpt 158958 2004-05-19 08:56:50Z helly $ */
 
 	require("interbase.inc");
     
diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index e31bf0296..4be516701 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,v 1.10 2004/05/30 16:20:25 abies Exp $ */
+<?php /* $Id: 003.phpt 160078 2004-05-30 16:20:25Z abies $ */
 
     require("interbase.inc");
     ibase_connect($test_base);
diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt
index 490aeef62..e6437f441 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,v 1.14 2004/05/19 08:54:52 helly Exp $ */
+<?php /* $Id: 004.phpt 158958 2004-05-19 08:56:50Z helly $ */
 
     require("interbase.inc");
     
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index ae61b0bda..e3292805c 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,v 1.8 2004/05/19 08:54:52 helly Exp $ */
+<?php /* $Id: 005.phpt 158958 2004-05-19 08:56:50Z helly $ */
 
     require("interbase.inc");
     
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index 605feb241..2aeb0739d 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,v 1.11 2004/05/30 16:20:25 abies Exp $ */
+<?php /* $Id: 006.phpt 160078 2004-05-30 16:20:25Z abies $ */
 
 	require("interbase.inc");
 	
diff --git a/ext/interbase/tests/007.phpt b/ext/interbase/tests/007.phpt
index aee7bfecb..f53d67c10 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,v 1.4 2004/05/30 16:20:25 abies Exp $ */
+<?php /* $Id: 007.phpt 160078 2004-05-30 16:20:25Z abies $ */
 
 	require("interbase.inc");
 	
diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt
index dfe32365f..627d77d1a 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,v 1.3 2004/05/19 08:54:52 helly Exp $ */
+<?php /* $Id: 008.phpt 158958 2004-05-19 08:56:50Z helly $ */
 
 require("interbase.inc");
 
diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc
index 304191b28..7e567ff19 100755
--- a/ext/interbase/tests/interbase.inc
+++ b/ext/interbase/tests/interbase.inc
@@ -1,4 +1,4 @@
-<?php /* $Id: interbase.inc,v 1.10.8.1 2008/10/07 12:51:21 felipe Exp $ */
+<?php /* $Id: interbase.inc 267053 2008-10-07 12:51:21Z felipe $ */
 
 srand((double)microtime()*1000000);
 
diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
index 6d71bca15..78c0d5ca3 100755
--- a/ext/interbase/tests/skipif.inc
+++ b/ext/interbase/tests/skipif.inc
@@ -1,4 +1,4 @@
-<?php /* $Id: skipif.inc,v 1.3 2004/04/01 16:25:51 abies Exp $ */
+<?php /* $Id: skipif.inc 155152 2004-04-01 16:25:51Z abies $ */
 
 if (!extension_loaded("interbase")) print "skip";