Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Remove hard coded lib extension. Prepare for OCI8 1.4.2 release

experimental/lemon
Christopher Jones 16 years ago
parent
b50c9a6102
commit
bcda2ac012
3 changed files with 24 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ext/oci8/config.m4
  2. 32
      ext/oci8/package.xml
  3. 2
      ext/oci8/php_oci8.h

2
ext/oci8/config.m4
View File

@ -37,7 +37,7 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
else
dnl This isn't an ORACLE_HOME. Try heuristic examination of the dir to help the user
if test -f "$OCI8_DIR/libociei.so"; then
if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
AC_MSG_ERROR([Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}])
else
AC_MSG_ERROR([Oracle library directory not found in ${OCI8_DIR}])

32
ext/oci8/package.xml
View File

@ -33,7 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
<active>no</active>
</lead>
<date>2010-02-11</date>
<date>2010-06-25</date>
<time>15:00:00</time>
<version>
@ -41,12 +41,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
<api>1.4.2</api>
</version>
<stability>
<release>development</release>
<api>development</api>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
Fixed bug #51691 (Unnecessary realloc causes crashes in PHP trunk tests with interned strings)
Fixed bug #51291 (oci_error doesn't report last error when called two times)
Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
Fixed bug #52186 (phpinfo() shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2)
</notes>
<contents>
<dir name="/">
@ -76,20 +79,27 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="b47243_1.phpt" role="test" />
<file name="b47243_2.phpt" role="test" />
<file name="b47243_3.phpt" role="test" />
<file name="bind_char_1_11gR1.phpt" role="test" />
<file name="bind_char_1.phpt" role="test" />
<file name="bind_char_2_11gR1.phpt" role="test" />
<file name="bind_char_2.phpt" role="test" />
<file name="bind_char_3_11gR1.phpt" role="test" />
<file name="bind_char_3.phpt" role="test" />
<file name="bind_char_4_11gR1.phpt" role="test" />
<file name="bind_char_4.phpt" role="test" />
<file name="bind_empty.phpt" role="test" />
<file name="bind_error.phpt" role="test" />
<file name="bind_long.phpt" role="test" />
<file name="bind_long_raw.phpt" role="test" />
<file name="bind_raw.phpt" role="test" />
<file name="bind_rowid.phpt" role="test" />
<file name="bug26133.phpt" role="test" />
<file name="bug27303_1_11gR1.phpt" role="test" />
<file name="bug27303_1.phpt" role="test" />
<file name="bug27303_2_11gR1.phpt" role="test" />
<file name="bug27303_2.phpt" role="test" />
<file name="bug27303_3.phpt" role="test" />
<file name="bug27303_4_11gR1.phpt" role="test" />
<file name="bug27303_4.phpt" role="test" />
<file name="bug27303.phpt" role="test" />
<file name="bug32325.phpt" role="test" />
<file name="bug35973.phpt" role="test" />
<file name="bug36010.phpt" role="test" />
@ -118,7 +128,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="bug46994.phpt" role="test" />
<file name="bug47189.phpt" role="test" />
<file name="bug47281.phpt" role="test" />
<file name="bug6109.phpt" role="test" />
<file name="bug51253.phpt" role="test" />
<file name="bug51291.phpt" role="test" />
<file name="close.phpt" role="test" />
<file name="coll_001.phpt" role="test" />
<file name="coll_002_func.phpt" role="test" />
@ -152,8 +163,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="coll_017.phpt" role="test" />
<file name="coll_018.phpt" role="test" />
<file name="coll_019.phpt" role="test" />
<file name="commit_001.phpt" role="test" />
<file name="commit_002.phpt" role="test" />
<file name="commit_old.phpt" role="test" />
<file name="commit.phpt" role="test" />
<file name="conn_attr_1.phpt" role="test" />
<file name="conn_attr_2.phpt" role="test" />
<file name="conn_attr_3.phpt" role="test" />
@ -218,7 +230,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="edition_2.phpt" role="test" />
<file name="error1.phpt" role="test" />
<file name="error2.phpt" role="test" />
<file name="error_bind.phpt" role="test" />
<file name="error_old.phpt" role="test" />
<file name="error_parse.phpt" role="test" />
<file name="error.phpt" role="test" />
<file name="exec_fetch.phpt" role="test" />
<file name="execute_mode.phpt" role="test" />
@ -295,11 +309,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="lob_temp.phpt" role="test" />
<file name="minfo.phpt" role="test" />
<file name="num.phpt" role="test" />
<file name="oci8safemode.phpt" role="test" />
<file name="oci_execute_segfault.phpt" role="test" />
<file name="old_oci_close1.phpt" role="test" />
<file name="old_oci_close.phpt" role="test" />
<file name="parse_error.phpt" role="test" />
<file name="password_2.phpt" role="test" />
<file name="password_new.phpt" role="test" />
<file name="password_old.phpt" role="test" />
@ -309,6 +321,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="pecl_bug10194.phpt" role="test" />
<file name="pecl_bug16035.phpt" role="test" />
<file name="pecl_bug16842.phpt" role="test" />
<file name="pecl_bug6109.phpt" role="test" />
<file name="pecl_bug8816.phpt" role="test" />
<file name="persistent.phpt" role="test" />
<file name="prefetch_old.phpt" role="test" />
@ -320,7 +333,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="refcur_prefetch_3.phpt" role="test" />
<file name="reflection1.phpt" role="test" />
<file name="reflection2.phpt" role="test" />
<file name="rowid_bind.phpt" role="test" />
<file name="select_null.phpt" role="test" />
<file name="serverversion.phpt" role="test" />
<file name="skipif.inc" role="test" />

2
ext/oci8/php_oci8.h
View File

@ -46,7 +46,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
#define PHP_OCI8_VERSION "1.4.2-development"
#define PHP_OCI8_VERSION "1.4.2"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry

Write Preview
Loading…
Cancel
Save