Skip to content

Commit e68c1ef

Browse files
cjbjcjbj
committed
Added a LICENSE file to make it easier for PECL binary distributions to conform with the license.
1 parent 29e5a96 commit e68c1ef

File tree

3 files changed

+94
-10
lines changed

3 files changed

+94
-10
lines changed

‎ext/oci8/LICENSE

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
--------------------------------------------------------------------
2+
The PHP License, version 3.01
3+
Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
4+
--------------------------------------------------------------------
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, is permitted provided that the following conditions
8+
are met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
18+
3. The name "PHP" must not be used to endorse or promote products
19+
derived from this software without prior written permission. For
20+
written permission, please contact [email protected].
21+
22+
4. Products derived from this software may not be called "PHP", nor
23+
may "PHP" appear in their name, without prior written permission
24+
from [email protected]. You may indicate that your software works in
25+
conjunction with PHP by saying "Foo for PHP" instead of calling
26+
it "PHP Foo" or "phpfoo"
27+
28+
5. The PHP Group may publish revised and/or new versions of the
29+
license from time to time. Each version will be given a
30+
distinguishing version number.
31+
Once covered code has been published under a particular version
32+
of the license, you may always continue to use it under the terms
33+
of that version. You may also choose to use such covered code
34+
under the terms of any subsequent version of the license
35+
published by the PHP Group. No one other than the PHP Group has
36+
the right to modify the terms applicable to covered code created
37+
under this License.
38+
39+
6. Redistributions of any form whatsoever must retain the following
40+
acknowledgment:
41+
"This product includes PHP software, freely available from
42+
<http://www.php.net/software/>".
43+
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45+
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55+
OF THE POSSIBILITY OF SUCH DAMAGE.
56+
57+
--------------------------------------------------------------------
58+
59+
This software consists of voluntary contributions made by many
60+
individuals on behalf of the PHP Group.
61+
62+
The PHP Group can be contacted via Email at [email protected].
63+
64+
For more information on the PHP Group and the PHP project,
65+
please see <http://www.php.net>.
66+
67+
PHP includes the Zend Engine, freely available at
68+
<http://www.zend.com>.

‎ext/oci8/package.xml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,21 @@ libraries are available.
4545
<active>no</active>
4646
</lead>
4747

48-
<date>2013-10-17</date>
48+
<date>2013-10-22</date>
4949
<time>12:00:00</time>
5050

5151
<version>
52-
<release>2.0.5</release>
53-
<api>2.0.5</api>
52+
<release>2.0.6</release>
53+
<api>2.0.6</api>
5454
</version>
5555
<stability>
5656
<release>stable</release>
5757
<api>stable</api>
5858
</stability>
5959
<license uri="http://www.php.net/license">PHP</license>
6060
<notes>
61-
Bump PHP OCI8 2.0 mininum requirements to PHP 5.2 and Oracle client
62-
library 10.2. (Use OCI8 1.4 for older PHP version support or if only
63-
Oracle 9.2 client libraries are available.)
64-
65-
Re-enable php_oci8.dll and php_oci8_11g.dll for Windows builds so URL
66-
links work in the new Windows PECL infrastructure.
61+
Added a LICENSE file to make it easier for PECL binary distributions
62+
to conform with the license.
6763
</notes>
6864
<contents>
6965
<dir name="/">
@@ -462,6 +458,26 @@ links work in the new Windows PECL infrastructure.
462458
</extsrcrelease>
463459
<changelog>
464460

461+
<release>
462+
<version>
463+
<release>2.0.5</release>
464+
<api>2.0.5</api>
465+
</version>
466+
<stability>
467+
<release>stable</release>
468+
<api>stable</api>
469+
</stability>
470+
<license uri="http://www.php.net/license">PHP</license>
471+
<notes>
472+
Bump PHP OCI8 2.0 mininum requirements to PHP 5.2 and Oracle client
473+
library 10.2. (Use OCI8 1.4 for older PHP version support or if only
474+
Oracle 9.2 client libraries are available.)
475+
476+
Re-enable php_oci8.dll and php_oci8_11g.dll for Windows builds so URL
477+
links work in the new Windows PECL infrastructure.
478+
</notes>
479+
</release>
480+
465481
<release>
466482
<version>
467483
<release>2.0.4</release>

‎ext/oci8/php_oci8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
#undef PHP_OCI8_VERSION
4747
#endif
48-
#define PHP_OCI8_VERSION "2.0.5"
48+
#define PHP_OCI8_VERSION "2.0.6"
4949

5050
extern zend_module_entry oci8_module_entry;
5151
#define phpext_oci8_ptr &oci8_module_entry

0 commit comments

Comments
 (0)