summaryrefslogtreecommitdiff
path: root/ext/pdo_firebird
diff options
context:
space:
mode:
Diffstat (limited to 'ext/pdo_firebird')
-rw-r--r--ext/pdo_firebird/firebird_driver.c8
-rw-r--r--ext/pdo_firebird/firebird_statement.c8
-rw-r--r--ext/pdo_firebird/package.xml57
-rw-r--r--ext/pdo_firebird/package2.xml69
-rw-r--r--ext/pdo_firebird/pdo_firebird.c10
-rw-r--r--ext/pdo_firebird/php_pdo_firebird.h8
-rw-r--r--ext/pdo_firebird/php_pdo_firebird_int.h8
-rw-r--r--ext/pdo_firebird/tests/common.phpt2
8 files changed, 91 insertions, 79 deletions
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index 0accbea87..82faa2b39 100644
--- a/ext/pdo_firebird/firebird_driver.c
+++ b/ext/pdo_firebird/firebird_driver.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | 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_0.txt. |
+ | 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. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_driver.c,v 1.17.2.1 2005/09/11 01:42:41 wez Exp $ */
+/* $Id: firebird_driver.c,v 1.17.2.2 2006/01/01 12:50:11 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
index 95415e805..96947e771 100644
--- a/ext/pdo_firebird/firebird_statement.c
+++ b/ext/pdo_firebird/firebird_statement.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | 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_0.txt. |
+ | 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. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_statement.c,v 1.18 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: firebird_statement.c,v 1.18.2.1 2006/01/01 12:50:11 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/ext/pdo_firebird/package.xml b/ext/pdo_firebird/package.xml
deleted file mode 100644
index b07870189..000000000
--- a/ext/pdo_firebird/package.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE package SYSTEM "../pear/package.dtd">
-<package version="1.0"><!-- $Id: package.xml,v 1.7.2.1 2005/09/11 05:27:29 wez Exp $ -->
- <name>PDO_FIREBIRD</name>
- <summary>Firebird/InterBase 6 driver for PDO</summary>
- <maintainers>
- <maintainer>
- <user>abies</user>
- <name>Ard Biesheuvel</name>
- <email>abies@php.net</email>
- <role>lead</role>
- </maintainer>
- </maintainers>
- <configureoptions>
- <configureoption name="with-pdo-firebird" prompt="dir"/>
-</configureoptions>
- <description>
- This extension provides a Firebird/InterBase driver for PDO. It supports
- all versions of Firebird and InterBase versions 6 and up.
- </description>
- <license>PHP</license>
- <release>
- <state>beta</state>
- <version>0.3</version>
- <date>2005-09-11</date>
-
- <notes>
- To compile and run this module, you will need to have the main PDO module and Firebird's
- or InterBase's client library installed on your system.
-
- Hope it works!
- </notes>
-
- <filelist>
- <file role="doc" name="CREDITS"/>
-
- <file role="src" name="config.m4"/>
- <file role="src" name="config.w32"/>
- <file role="src" name="firebird_driver.c"/>
- <file role="src" name="firebird_statement.c"/>
- <file role="src" name="pdo_firebird.c"/>
- <file role="src" name="php_pdo_firebird.h"/>
- <file role="src" name="php_pdo_firebird_int.h"/>
-
- <dir name="tests">
- <file role="test">connect.phpt</file>
- <file role="test">ddl.phpt</file>
- <file role="test">execute.phpt</file>
- </dir>
-
- </filelist>
- <deps>
- <dep type="php" rel="ge" version="5.0.3"/>
- <dep type="ext" rel="ge" name="pdo" version="1.0RC1"/>
- </deps>
- </release>
-</package>
diff --git a/ext/pdo_firebird/package2.xml b/ext/pdo_firebird/package2.xml
new file mode 100644
index 000000000..414b9e6c8
--- /dev/null
+++ b/ext/pdo_firebird/package2.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.2" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>PDO_FIREBIRD</name>
+ <channel>pecl.php.net</channel>
+ <summary>Firebird/InterBase 6 driver for PDO</summary>
+ <description>This extension provides a Firebird/InterBase driver for PDO. It supports
+all versions of Firebird and InterBase versions 6 and up.
+ </description>
+ <lead>
+ <name>Ard Biesheuvel</name>
+ <user>abies</user>
+ <email>abies@php.net</email>
+ <active>yes</active>
+ </lead>
+ <date>2005-12-04</date>
+ <version>
+ <release>0.3</release>
+ <api>0.3</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>To compile and run this module, you will need to have the main PDO module and Firebird&apos;s
+or InterBase&apos;s client library installed on your system.
+Hope it works!
+ </notes>
+ <contents>
+ <dir name="/">
+ <dir name="tests">
+ <file name="connect.phpt" role="test" />
+ <file name="ddl.phpt" role="test" />
+ <file name="execute.phpt" role="test" />
+ </dir> <!-- //tests -->
+ <file name="config.m4" role="src" />
+ <file name="config.w32" role="src" />
+ <file name="CREDITS" role="doc" />
+ <file name="firebird_driver.c" role="src" />
+ <file name="firebird_statement.c" role="src" />
+ <file name="pdo_firebird.c" role="src" />
+ <file name="php_pdo_firebird.h" role="src" />
+ <file name="php_pdo_firebird_int.h" role="src" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>5.0.3</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.0</min>
+ </pearinstaller>
+ <package>
+ <name>pdo</name>
+ <channel>pecl.php.net</channel>
+ <min>1.0</min>
+ <providesextension>PDO</providesextension>
+ </package>
+ </required>
+ </dependencies>
+ <providesextension>PDO_FIREBIRD</providesextension>
+ <extsrcrelease>
+ <configureoption name="with-pdo-firebird" prompt="dir" />
+ </extsrcrelease>
+</package>
diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c
index 956f836c1..dfb985a17 100644
--- a/ext/pdo_firebird/pdo_firebird.c
+++ b/ext/pdo_firebird/pdo_firebird.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | 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_0.txt. |
+ | 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. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_firebird.c,v 1.4.2.1 2005/09/11 05:27:30 wez Exp $ */
+/* $Id: pdo_firebird.c,v 1.4.2.3 2006/01/01 12:50:11 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,7 +30,7 @@
#include "php_pdo_firebird.h"
#include "php_pdo_firebird_int.h"
-function_entry pdo_firebird_functions[] = { /* {{{ */
+zend_function_entry pdo_firebird_functions[] = { /* {{{ */
{NULL, NULL, NULL}
};
/* }}} */
diff --git a/ext/pdo_firebird/php_pdo_firebird.h b/ext/pdo_firebird/php_pdo_firebird.h
index 5af158dfc..8545b4be1 100644
--- a/ext/pdo_firebird/php_pdo_firebird.h
+++ b/ext/pdo_firebird/php_pdo_firebird.h
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | 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_0.txt. |
+ | 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. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_firebird.h,v 1.3 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: php_pdo_firebird.h,v 1.3.2.1 2006/01/01 12:50:11 sniper Exp $ */
#ifndef PHP_PDO_FIREBIRD_H
#define PHP_PDO_FIREBIRD_H
diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h b/ext/pdo_firebird/php_pdo_firebird_int.h
index 62f68a313..01bdce9b2 100644
--- a/ext/pdo_firebird/php_pdo_firebird_int.h
+++ b/ext/pdo_firebird/php_pdo_firebird_int.h
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | 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_0.txt. |
+ | 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. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_firebird_int.h,v 1.10 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: php_pdo_firebird_int.h,v 1.10.2.1 2006/01/01 12:50:11 sniper Exp $ */
#ifndef PHP_PDO_FIREBIRD_INT_H
#define PHP_PDO_FIREBIRD_INT_H
diff --git a/ext/pdo_firebird/tests/common.phpt b/ext/pdo_firebird/tests/common.phpt
index cb1caf315..00d4b239a 100644
--- a/ext/pdo_firebird/tests/common.phpt
+++ b/ext/pdo_firebird/tests/common.phpt
@@ -2,7 +2,7 @@
FIREBIRD
--SKIPIF--
<?php # vim:ft=php
-if (!extension_loaded('pdo_odbc')) print 'skip'; ?>
+if (!extension_loaded('pdo_firebird')) print 'skip'; ?>
--REDIRECTTEST--
# magic auto-configuration
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-10 12:27:35 +0000