#endif
/* {{{ static protos */
-static void php_oci_connection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-static void php_oci_pconnection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-static void php_oci_pconnection_list_np_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-static void php_oci_statement_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-static void php_oci_descriptor_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-static void php_oci_spool_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC);
-static void php_oci_collection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
-
-static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC);
+static void php_oci_connection_list_dtor (zend_resource * TSRMLS_DC);
+static void php_oci_pconnection_list_dtor (zend_resource * TSRMLS_DC);
+static void php_oci_pconnection_list_np_dtor (zend_resource * TSRMLS_DC);
+static void php_oci_statement_list_dtor (zend_resource * TSRMLS_DC);
+static void php_oci_descriptor_list_dtor (zend_resource * TSRMLS_DC);
+static void php_oci_spool_list_dtor(zend_resource *entry TSRMLS_DC);
+static void php_oci_collection_list_dtor (zend_resource * TSRMLS_DC);
+
+static int php_oci_persistent_helper(zend_resource *le TSRMLS_DC);
static int php_oci_connection_ping(php_oci_connection * TSRMLS_DC);
static int php_oci_connection_status(php_oci_connection * TSRMLS_DC);
static int php_oci_connection_close(php_oci_connection * TSRMLS_DC);
static int php_oci_create_session(php_oci_connection *connection, php_oci_spool *session_pool, char *dbname, int dbname_len, char *username, int username_len, char *password, int password_len, char *new_password, int new_password_len, int session_mode TSRMLS_DC);
static int php_oci_old_create_session(php_oci_connection *connection, char *dbname, int dbname_len, char *username, int username_len, char *password, int password_len, char *new_password, int new_password_len, int session_mode TSRMLS_DC);
static php_oci_spool *php_oci_get_spool(char *username, int username_len, char *password, int password_len, char *dbname, int dbname_len, int charsetid TSRMLS_DC);
-static php_oci_spool *php_oci_create_spool(char *username, int username_len, char *password, int password_len, char *dbname, int dbname_len, char *hash_key, int hash_key_len, int charsetid TSRMLS_DC);
+static php_oci_spool *php_oci_create_spool(char *username, int username_len, char *password, int password_len, char *dbname, int dbname_len, zend_string *hash_key, int charsetid TSRMLS_DC);
static sword php_oci_ping_init(php_oci_connection *connection, OCIError *errh TSRMLS_DC);
/* }}} */
*
* Non-persistent connection destructor
*/
-static void php_oci_connection_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_connection_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_connection *connection = (php_oci_connection *)entry->ptr;
*
* Persistent connection destructor
*/
-static void php_oci_pconnection_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_pconnection_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_connection *connection = (php_oci_connection *)entry->ptr;
* Non-Persistent destructor for persistent connection - This gets invoked when
* the refcount of this goes to zero in the regular list
*/
-static void php_oci_pconnection_list_np_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_pconnection_list_np_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_connection *connection = (php_oci_connection *)entry->ptr;
- zend_rsrc_list_entry *le;
+ zval *zvp;
+ zend_resource *le;
/*
* We cannot get connection as NULL or as a stub in this function. This is the function that
OCI_G(in_call)) {
/* Remove the hash entry if present */
- if ((zend_hash_find(&EG(persistent_list), connection->hash_key, strlen(connection->hash_key)+1, (void **) &le)== SUCCESS) && (le->type == le_pconnection) && (le->ptr == connection)) {
- zend_hash_del(&EG(persistent_list), connection->hash_key, strlen(connection->hash_key)+1);
+ zvp = zend_hash_find(&EG(persistent_list), connection->hash_key);
+ le = Z_RES_P(zvp); /* PHPNG TODO check for null zvp */
+ if (le != NULL && le->type == le_pconnection && le->ptr == connection) {
+ zend_hash_del(&EG(persistent_list), connection->hash_key);
}
else {
php_oci_connection_close(connection TSRMLS_CC);
*
* Statement destructor
*/
-static void php_oci_statement_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_statement_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_statement *statement = (php_oci_statement *)entry->ptr;
php_oci_statement_free(statement TSRMLS_CC);
*
* Descriptor destructor
*/
-static void php_oci_descriptor_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_descriptor_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_descriptor *descriptor = (php_oci_descriptor *)entry->ptr;
php_oci_lob_free(descriptor TSRMLS_CC);
*
* Collection destructor
*/
-static void php_oci_collection_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_collection_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_collection *collection = (php_oci_collection *)entry->ptr;
php_oci_collection_close(collection TSRMLS_CC);
php_oci_out_column *column = (php_oci_out_column *) data;
TSRMLS_FETCH();
- if (column->stmtid) {
- zend_list_delete(column->stmtid);
- }
+ /* if (column->stmtid) { */ /* PHPNG TODO */
+ zend_list_close(column->stmtid);
+ /* } */
- if (column->is_descr) {
- zend_list_delete(column->descid);
- }
+ /* if (column->is_descr) { */ /* PHPNG TODO */
+ zend_list_close(column->descid);
+ /* } */
if (column->data) {
efree(column->data);
*/
php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char *password, int password_len, char *new_password, int new_password_len, char *dbname, int dbname_len, char *charset, long session_mode, int persistent, int exclusive TSRMLS_DC)
{
- zend_rsrc_list_entry *le;
- zend_rsrc_list_entry new_le;
+ zval *zvp;
+ zend_resource *le;
+ zend_resource new_le;
php_oci_connection *connection = NULL;
smart_str hashed_details = {0};
time_t timestamp;
smart_str_0(&hashed_details);
/* make it lowercase */
- php_strtolower(hashed_details.c, hashed_details.len);
+ /* PHPNG TODO is this safe to do? What about interned strings? */
+ php_strtolower(hashed_details.s->val, hashed_details.s->len);
if (!exclusive && !new_password) {
zend_bool found = 0;
- if (persistent && zend_hash_find(&EG(persistent_list), hashed_details.c, hashed_details.len+1, (void **) &le) == SUCCESS) {
+ /* PHPNG TODO Check hashed_details is used correctly */
+ if (persistent && ((zvp = zend_hash_find(&EG(persistent_list), hashed_details.s))) != NULL) {
+ zend_resource *le = Z_RES_P(zvp);
+
found = 1;
/* found */
if (le->type == le_pconnection) {
connection = (php_oci_connection *)le->ptr;
}
- } else if (!persistent && zend_hash_find(&EG(regular_list), hashed_details.c, hashed_details.len+1, (void **) &le) == SUCCESS) {
+ } else if (!persistent && ((zvp = zend_hash_find(&EG(regular_list), hashed_details.s)) != NULL)) {
+ le = Z_RES_P(zvp);
found = 1;
if (le->type == le_index_ptr) {
int type, link;
void *ptr;
link = OCI8_PTR_TO_INT(le->ptr);
- ptr = zend_list_find(link,&type);
+ ptr = zend_list_find(link, &type); /* PHPNG TODO */
if (ptr && (type == le_connection)) {
connection = (php_oci_connection *)ptr;
}
if (connection && connection->is_persistent && connection->is_stub) {
if (php_oci_create_session(connection, NULL, dbname, dbname_len, username, username_len, password, password_len, new_password, new_password_len, session_mode TSRMLS_CC)) {
smart_str_free_ex(&hashed_details, 0);
- zend_hash_del(&EG(persistent_list), connection->hash_key, strlen(connection->hash_key)+1);
+ zend_hash_del(&EG(persistent_list), connection->hash_key);
return NULL;
}
connection->used_this_request = 1;
tmp = (php_oci_connection *)zend_list_find(connection->id, &rsrc_type);
- if (tmp != NULL && rsrc_type == le_pconnection && strlen(tmp->hash_key) == hashed_details.len &&
- memcmp(tmp->hash_key, hashed_details.c, hashed_details.len) == 0 && zend_list_addref(connection->id) == SUCCESS) {
+ if (tmp != NULL && rsrc_type == le_pconnection && tmp->hash_key->len == hashed_details.s->len &&
+ memcmp(tmp->hash_key->val, hashed_details.s->val, tmp->hash_key->len) == 0 && zend_list_addref(connection->id) == SUCCESS) {
/* do nothing */
} else {
PHP_OCI_REGISTER_RESOURCE(connection, le_pconnection);
le->ptr = NULL;
}
- zend_hash_del(&EG(persistent_list), hashed_details.c, hashed_details.len+1);
+ zend_hash_del(&EG(persistent_list), hashed_details.s);
} else {
/* We only remove the hash entry. The resource and the list entry with its pointer
* to the resource are still intact
*/
- zend_hash_del(&EG(regular_list), hashed_details.c, hashed_details.len+1);
+ zend_hash_del(&EG(regular_list), hashed_details.s);
}
connection = NULL;
} else if (found) {
/* found something, but it's not a connection, delete it */
if (persistent) {
- zend_hash_del(&EG(persistent_list), hashed_details.c, hashed_details.len+1);
+ zend_hash_del(&EG(persistent_list), hashed_details.s);
} else {
- zend_hash_del(&EG(regular_list), hashed_details.c, hashed_details.len+1);
+ zend_hash_del(&EG(regular_list), hashed_details.s);
}
}
}
if (alloc_non_persistent) {
connection = (php_oci_connection *) ecalloc(1, sizeof(php_oci_connection));
- connection->hash_key = estrndup(hashed_details.c, hashed_details.len);
+ connection->hash_key = zend_str_dup(hashed_details.s, 0);
connection->is_persistent = 0;
#ifdef HAVE_OCI8_DTRACE
connection->client_id = NULL;
if (connection == NULL) {
return NULL;
}
- connection->hash_key = zend_strndup(hashed_details.c, hashed_details.len);
+ connection->hash_key = zend_str_dup(hashed_details.s, 1);
if (connection->hash_key == NULL) {
free(connection);
return NULL;
}
} else {
connection = (php_oci_connection *) ecalloc(1, sizeof(php_oci_connection));
- connection->hash_key = estrndup(hashed_details.c, hashed_details.len);
+ connection->hash_key = zend_str_dup(hashed_details.s, 0);
connection->is_persistent = 0;
#ifdef HAVE_OCI8_DTRACE
connection->client_id = NULL;
if (OCI_G(old_oci_close_semantics)) {
zend_list_addref(connection->id);
}
- zend_hash_update(&EG(persistent_list), connection->hash_key, strlen(connection->hash_key)+1, (void *)&new_le, sizeof(zend_rsrc_list_entry), NULL);
+ zend_hash_update_mem(&EG(persistent_list), connection->hash_key, (void *)&new_le, sizeof(zend_resource));
OCI_G(num_persistent)++;
OCI_G(num_links)++;
} else if (!exclusive) {
PHP_OCI_REGISTER_RESOURCE(connection, le_connection);
new_le.ptr = OCI8_INT_TO_PTR(connection->id);
new_le.type = le_index_ptr;
- zend_hash_update(&EG(regular_list), connection->hash_key, strlen(connection->hash_key)+1, (void *)&new_le, sizeof(zend_rsrc_list_entry), NULL);
+ zend_hash_update_mem(&EG(regular_list), connection->hash_key, (void *)&new_le, sizeof(zend_resource));
OCI_G(num_links)++;
} else {
PHP_OCI_REGISTER_RESOURCE(connection, le_connection);
return 1;
} else {
if (lob_length > 0) {
- ZVAL_STRINGL(value, lob_buffer, lob_length, 0);
+ ZVAL_STRINGL(value, lob_buffer, lob_length);
} else {
ZVAL_EMPTY_STRING(value);
}
return 0;
}
- ZVAL_STRINGL(value, column->data, column_size, 1);
+ ZVAL_STRINGL(value, column->data, column_size);
}
return 0;
}
* Helper function to close/rollback persistent connections at the end of request. A return value of
* 1 indicates that the connection is to be destroyed
*/
-static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
+static int php_oci_persistent_helper(zend_resource *le TSRMLS_DC)
{
time_t timestamp;
php_oci_connection *connection;
*
* Create(alloc + Init) Session pool for the given dbname and charsetid
*/
-static php_oci_spool *php_oci_create_spool(char *username, int username_len, char *password, int password_len, char *dbname, int dbname_len, char *hash_key, int hash_key_len, int charsetid TSRMLS_DC)
+static php_oci_spool *php_oci_create_spool(char *username, int username_len, char *password, int password_len, char *dbname, int dbname_len, zend_string *hash_key, int charsetid TSRMLS_DC)
{
php_oci_spool *session_pool = NULL;
zend_bool iserror = 0;
}
/* Populate key if passed */
- if (hash_key_len) {
- session_pool->spool_hash_key = zend_strndup(hash_key, hash_key_len);
+ if (hash_key->val) {
+ session_pool->spool_hash_key = zend_str_dup(hash_key, 1);
if (session_pool->spool_hash_key == NULL) {
iserror = 1;
goto exit_create_spool;
{
smart_str spool_hashed_details = {0};
php_oci_spool *session_pool = NULL;
- zend_rsrc_list_entry spool_le = {0};
- zend_rsrc_list_entry *spool_out_le = NULL;
+ zend_resource spool_le = {0};
+ zend_resource *spool_out_le = NULL;
zend_bool iserror = 0;
/* {{{ Create the spool hash key */
/* Session Pool Hash Key : oci8spool***username**edition**hashedpassword**dbname**charset */
smart_str_0(&spool_hashed_details);
- php_strtolower(spool_hashed_details.c, spool_hashed_details.len);
+ /* PHPNG TODO is this safe to do? */
+ php_strtolower(spool_hashed_details.s->val, spool_hashed_details.s->len);
/* }}} */
- if (zend_hash_find(&EG(persistent_list),spool_hashed_details.c, spool_hashed_details.len+1, (void **)&spool_out_le) == FAILURE) {
+ if ((spool_out_le = zend_hash_find(&EG(persistent_list), spool_hashed_details.s)) == NULL) {
- session_pool = php_oci_create_spool(username, username_len, password, password_len, dbname, dbname_len, spool_hashed_details.c, spool_hashed_details.len, charsetid TSRMLS_CC);
+ session_pool = php_oci_create_spool(username, username_len, password, password_len, dbname, dbname_len, spool_hashed_details.s, charsetid TSRMLS_CC);
if (session_pool == NULL) {
iserror = 1;
spool_le.ptr = session_pool;
spool_le.type = le_psessionpool;
PHP_OCI_REGISTER_RESOURCE(session_pool, le_psessionpool);
- zend_hash_update(&EG(persistent_list), session_pool->spool_hash_key, strlen(session_pool->spool_hash_key)+1,(void *)&spool_le, sizeof(zend_rsrc_list_entry),NULL);
+ zend_hash_update_mem(&EG(persistent_list), session_pool->spool_hash_key, (void *)&spool_le, sizeof(zend_resource));
} else if (spool_out_le->type == le_psessionpool &&
- strlen(((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key) == spool_hashed_details.len &&
- memcmp(((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key, spool_hashed_details.c, spool_hashed_details.len) == 0) {
+ ((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key->len == spool_hashed_details.s->len &&
+ memcmp(((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key->val, spool_hashed_details.s->val, spool_hashed_details.s->len) == 0) {
/* retrieve the cached session pool */
session_pool = (php_oci_spool *)(spool_out_le->ptr);
}
/* Persistent connections have private session pools */
if (connection->is_persistent && !connection->private_spool &&
- !(connection->private_spool = php_oci_create_spool(username, username_len, password, password_len, dbname, dbname_len, NULL, 0, connection->charset TSRMLS_CC))) {
+ !(connection->private_spool = php_oci_create_spool(username, username_len, password, password_len, dbname, dbname_len, NULL, connection->charset TSRMLS_CC))) {
return 1;
}
actual_spool = (connection->is_persistent) ? (connection->private_spool) : (session_pool);
*
* Session pool destructor function
*/
-static void php_oci_spool_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
+static void php_oci_spool_list_dtor(zend_resource *entry TSRMLS_DC)
{
php_oci_spool *session_pool = (php_oci_spool *)entry->ptr;
/* {{{ php_oci_spool */
typedef struct {
- int id; /* resource id */
+ zend_resource *id; /* resource id */
OCIEnv *env; /* env of this session pool */
OCIError *err; /* pool's error handle */
OCISPool *poolh; /* pool handle */
void *poolname; /* session pool name */
unsigned int poolname_len; /* length of session pool name */
- char *spool_hash_key; /* Hash key for session pool in plist */
+ zend_string *spool_hash_key; /* Hash key for session pool in plist */
} php_oci_spool;
/* }}} */
/* {{{ php_oci_connection */
typedef struct {
- int id; /* resource ID */
+ zend_resource *id; /* resource ID */
OCIEnv *env; /* private env handle */
ub2 charset; /* charset ID */
OCIServer *server; /* private server handle */
unsigned using_spool:1; /* Is this connection from session pool? */
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 */
+ zend_string *hash_key; /* hashed details of the connection */
#ifdef HAVE_OCI8_DTRACE
char *client_id; /* The oci_set_client_identifier() value */
#endif
/* {{{ php_oci_descriptor */
typedef struct {
- int id;
+ zend_resource *id;
ulong index; /* descriptors hash table index */
php_oci_connection *connection; /* parent connection handle */
dvoid *descriptor; /* OCI descriptor handle */
/* {{{ php_oci_collection */
typedef struct {
- int id;
+ zend_resource *id;
php_oci_connection *connection; /* parent connection handle */
OCIType *tdo; /* collection's type handle */
OCITypeCode coll_typecode; /* collection's typecode handle */
/* {{{ php_oci_define */
typedef struct {
- zval *zval; /* zval used in define */
+ zval zval; /* zval used in define */
text *name; /* placeholder's name */
ub4 name_len; /* placeholder's name length */
ub4 type; /* define type */
/* {{{ php_oci_statement */
typedef struct {
- int id;
- int parent_stmtid; /* parent statement id */
+ zend_resource *id;
+ zend_resource *parent_stmtid; /* parent statement id */
struct php_oci_statement *impres_child_stmt;/* child of current Implicit Result Set statement handle */
ub4 impres_count; /* count of remaining Implicit Result children on parent statement handle */
php_oci_connection *connection; /* parent connection handle */
/* {{{ php_oci_bind */
typedef struct {
OCIBind *bind; /* bind handle */
- zval *zval; /* value */
+ zval zval; /* value */
dvoid *descriptor; /* used for binding of LOBS etc */
OCIStmt *statement; /* used for binding REFCURSORs */
php_oci_statement *parent_statement; /* pointer to the parent statement */
ub4 retlen4;
ub2 is_descr; /* column contains a descriptor */
ub2 is_cursor; /* column contains a cursor */
- int stmtid; /* statement id for cursors */
- int descid; /* descriptor id for descriptors */
+ zend_resource *stmtid; /* statement id for cursors */
+ zend_resource *descid; /* descriptor id for descriptors */
void *data;
php_oci_define *define; /* define handle */
int piecewise; /* column is fetched piece-by-piece */
ZEND_FETCH_RESOURCE2(connection, php_oci_connection *, &zval, -1, "oci8 connection", le_connection, le_pconnection)
#define PHP_OCI_ZVAL_TO_STATEMENT(zval, statement) \
- ZEND_FETCH_RESOURCE(statement, php_oci_statement *, &zval, -1, "oci8 statement", le_statement)
+ ZEND_FETCH_RESOURCE(statement, php_oci_statement *, zval, -1, "oci8 statement", le_statement)
#define PHP_OCI_ZVAL_TO_DESCRIPTOR(zval, descriptor) \
ZEND_FETCH_RESOURCE(descriptor, php_oci_descriptor *, &zval, -1, "oci8 descriptor", le_descriptor)
projects / php / commitdiff