Skip to content

Commit 7045bd5

Browse files
committed
Merge branch 'bump_pecl_check' into PHP-5.5
* bump_pecl_check: Bump PECL package info version check to allow PECL installs with PHP 5.5+
2 parents dd71f1f + 6ac7c9d commit 7045bd5

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ PHP NEWS
4242
. Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
4343
(Stas)
4444

45+
- OCI8:
46+
. Bump PECL package info version check to allow PECL installs with PHP 5.5+
47+
4548
- PDO:
4649
. Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
4750
(Chris Jones)

ext/oci8/package.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
66
<name>oci8</name>
77
<channel>pecl.php.net</channel>
88
<summary>Extension for Oracle Database</summary>
9-
<description>This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x. It can be linked with Oracle 9.2, 10.2, 11.1, or 11.2 client libraries.
9+
<description>This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x. It can be linked with Oracle 9.2, 10, 11, or 12.1 client libraries.
1010
</description>
1111
<lead>
1212
<name>Christopher Jones</name>
@@ -33,20 +33,20 @@ http://pear.php.net/dtd/package-2.0.xsd">
3333
<active>no</active>
3434
</lead>
3535

36-
<date>2012-10-21</date>
36+
<date>2013-07-08</date>
3737
<time>12:00:00</time>
3838

3939
<version>
40-
<release>1.4.9</release>
41-
<api>1.4.9</api>
40+
<release>1.4.10</release>
41+
<api>1.4.10</api>
4242
</version>
4343
<stability>
4444
<release>stable</release>
4545
<api>stable</api>
4646
</stability>
4747
<license uri="http://www.php.net/license">PHP</license>
4848
<notes>
49-
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
49+
Bump PECL package info version check to allow PECL installs with PHP 5.5+
5050
</notes>
5151
<contents>
5252
<dir name="/">
@@ -397,7 +397,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
397397
<required>
398398
<php>
399399
<min>4.3.9</min>
400-
<max>5.4.99</max>
400+
<max>6.0.0</max>
401401
</php>
402402
<pearinstaller>
403403
<min>1.4.0b1</min>
@@ -410,6 +410,21 @@ http://pear.php.net/dtd/package-2.0.xsd">
410410
</extsrcrelease>
411411
<changelog>
412412

413+
<release>
414+
<version>
415+
<release>1.4.9</release>
416+
<api>1.4.9</api>
417+
</version>
418+
<stability>
419+
<release>stable</release>
420+
<api>stable</api>
421+
</stability>
422+
<license uri="http://www.php.net/license">PHP</license>
423+
<notes>
424+
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
425+
</notes>
426+
</release>
427+
413428
<release>
414429
<version>
415430
<release>1.4.8</release>

ext/oci8/php_oci8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
#undef PHP_OCI8_VERSION
4848
#endif
49-
#define PHP_OCI8_VERSION "1.4.9"
49+
#define PHP_OCI8_VERSION "1.4.10"
5050

5151
extern zend_module_entry oci8_module_entry;
5252
#define phpext_oci8_ptr &oci8_module_entry

0 commit comments

Comments
 (0)