diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
| commit | aba30ce30676b6d73a2169b10311dfb07768630c (patch) | |
| tree | a8f56339dff39eba9a933a718362f390ef77621d /ext/oci8/php_oci8_int.h | |
| parent | a3b0fa0d04cad5712f64e08463d0026f9890a37c (diff) | |
| parent | 56eee05f66431b153c9212452c1f4f2e8525efc4 (diff) | |
| download | php-git-aba30ce30676b6d73a2169b10311dfb07768630c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src:
Removed references to "Zend Support"
Added support for GNU Hurd. (Svante Signell)
- Updated to version 2013.6 (2013f)
More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Diffstat (limited to 'ext/oci8/php_oci8_int.h')
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 6155a883b0..2d4ff26947 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -156,6 +156,9 @@ typedef struct { time_t idle_expiry; /* time when the connection will be considered as expired */ time_t *next_pingp; /* (pointer to) time of the next ping */ char *hash_key; /* hashed details of the connection */ +#ifdef HAVE_OCI8_DTRACE + char *client_id; /* The oci_set_client_identifier() value */ +#endif } php_oci_connection; /* }}} */ |