diff options
| author | Christopher Jones <sixd@php.net> | 2008-01-31 01:33:30 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2008-01-31 01:33:30 +0000 |
| commit | 87dcb8df8e9cf7d08d33a380d98511d9cf88c705 (patch) | |
| tree | 32de10fba76b7f441b9e42c57fbdaddeff4c2397 /ext/oci8/php_oci8_int.h | |
| parent | 116539a5d187e099e1b9457a8b3f75ccfa7510e1 (diff) | |
| download | php-git-87dcb8df8e9cf7d08d33a380d98511d9cf88c705.tar.gz | |
Merge DRCP & FAN support. PHP6 sync will happen later
Diffstat (limited to 'ext/oci8/php_oci8_int.h')
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index aaa10087af..17df30c69e 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -97,13 +97,24 @@ extern zend_class_entry *oci_coll_class_entry_ptr; /* }}} */ +typedef struct { /* php_oci_spool {{{ */ + OCIEnv* env; /*env of this session pool */ + OCIError* err; /* pool's error handle */ + OCISPool *poolh; /* pool handle */ + void* poolname; /* session pool name */ + unsigned int poolnamelen; /* length of session pool name */ + char *spool_hash_key; /* Hash key for session pool in plist */ +} php_oci_spool; /* }}} */ + typedef struct { /* php_oci_connection {{{ */ OCIEnv *env; /* private env handle */ ub2 charset; /* charset ID */ OCIServer *server; /* private server handle */ OCISvcCtx *svc; /* private service context handle */ OCISession *session; /* private session handle */ + OCIAuthInfo *authinfo; /* Cached authinfo handle for OCISessionGet */ OCIError *err; /* private error handle */ + php_oci_spool *private_spool; /* private session pool (for persistent) */ sword errcode; /* last errcode */ HashTable *descriptors; /* descriptors hash, used to flush all the LOBs using this connection on commit */ @@ -113,6 +124,8 @@ typedef struct { /* php_oci_connection {{{ */ unsigned used_this_request:1; /* helps to determine if we should reset connection's next ping time and check its timeout */ unsigned needs_commit:1; /* helps to determine if we should rollback this connection on close/shutdown */ unsigned passwd_changed:1; /* helps determine if a persistent connection hash should be invalidated after a password change */ + unsigned is_stub:1; /* flag to keep track whether the connection structure has a real OCI connection associated */ + unsigned using_spool:1; /* Is this connection from session pool? */ int rsrc_id; /* resource ID */ time_t idle_expiry; /* time when the connection will be considered as expired */ time_t next_ping; /* time of the next ping */ @@ -321,6 +334,7 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char int php_oci_connection_rollback(php_oci_connection * TSRMLS_DC); int php_oci_connection_commit(php_oci_connection * TSRMLS_DC); +int php_oci_connection_release(php_oci_connection *connection TSRMLS_DC); int php_oci_password_change(php_oci_connection *, char *, int, char *, int, char *, int TSRMLS_DC); int php_oci_server_get_version(php_oci_connection *, char ** TSRMLS_DC); @@ -436,7 +450,8 @@ ZEND_BEGIN_MODULE_GLOBALS(oci) /* {{{ */ OCIEnv *env; /* global environment handle */ zend_bool in_call; - + char *connection_class; + zend_bool events; ZEND_END_MODULE_GLOBALS(oci) /* }}} */ #ifdef ZTS |