Skip to content

Build OCI8 and PDO OCI on azure #6604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nikic wants to merge 8 commits into from
Closed

Build OCI8 and PDO OCI on azure #6604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bcc0032
Fix misleading indentation warning
nikic Jan 14, 2021
dcfa618
Test oci on azure
nikic Jan 14, 2021
a9f00a6
Move installation into apt step
nikic Jan 14, 2021
6195681
Try removing ldap.h header
nikic Jan 14, 2021
01b84b7
Try to use rpath
nikic Jan 14, 2021
bbd8078
Use LDFLAGS
nikic Jan 14, 2021
e8d0d36
Disable new dtags
nikic Jan 15, 2021
d081525
Try to build PDO OCI shared as well
nikic Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions azure/apt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,13 @@ steps:
firebird-dev \
${{ parameters.packages }}
displayName: 'APT'
- script: |
mkdir /opt/oracle
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
unzip instantclient-basiclite-linuxx64.zip
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
unzip instantclient-sdk-linuxx64.zip
mv instantclient_*_* /opt/oracle/instantclient
# Interferes with libldap2 headers.
rm /opt/oracle/instantclient/sdk/include/ldap.h
displayName: 'Install Oracle Instant Client'
2 changes: 2 additions & 0 deletions azure/configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ steps:
--with-pdo-odbc=unixODBC,/usr \
--with-pdo-firebird \
--with-pdo-dblib \
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
--with-oci8=shared,instantclient,/opt/oracle/instantclient \
--enable-werror \
--with-config-file-path=/etc \
--with-config-file-scan-dir=/etc/php.d
Expand Down
9 changes: 5 additions & 4 deletions ext/pdo_oci/oci_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,11 @@ static sb4 oci_bind_output_cb(dvoid *ctx, OCIBind *bindp, ub4 iter, ub4 index, d

ZEND_ASSERT(param);

if (Z_ISREF(param->parameter))
parameter = Z_REFVAL(param->parameter);
else
parameter = &param->parameter;
if (Z_ISREF(param->parameter)) {
parameter = Z_REFVAL(param->parameter);
} else {
parameter = &param->parameter;
}

if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
P->actual_len = sizeof(OCILobLocator*);
Expand Down