diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 18:51:13 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2018-12-08 18:51:13 +1100 |
| commit | de9f64f5dd6b366757b759260527503b3966465c (patch) | |
| tree | f479b7d80dd1dc23746bbfd1dc81e49ecc0c4b6c /ext | |
| parent | 49944e4bcf615285ce96beb47989a03f995e6cf0 (diff) | |
| parent | 3c91851874f64061f5054f710cf145a53f55757f (diff) | |
| download | php-git-de9f64f5dd6b366757b759260527503b3966465c.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
When releasing an oci8 connection always set the resource to null.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/oci8/oci8.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index af1b44a458..3e631c0adc 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2351,7 +2351,6 @@ int php_oci_connection_release(php_oci_connection *connection) connection->svc = NULL; connection->server = NULL; connection->session = NULL; - connection->id = NULL; connection->is_attached = connection->is_open = connection->rb_on_disconnect = connection->used_this_request = 0; connection->is_stub = 1; @@ -2368,6 +2367,9 @@ int php_oci_connection_release(php_oci_connection *connection) #endif /* HAVE_OCI8_DTRACE */ } + /* Always set id to null, so next time a new resource is being registered. */ + connection->id = NULL; + OCI_G(in_call) = in_call_save; return result; } |