Merge branch 'PHP-7.0'

Author: cjbj

ext/oci8/oci8.c

@@ -2003,17 +2003,19 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
 
 							/* okay, the connection is open and the server is still alive */
 							connection->used_this_request = 1;
-							tmp_val = zend_hash_index_find(&EG(regular_list), connection->id->handle);
-							if ((tmp_val != NULL) && (Z_TYPE_P(tmp_val) == IS_RESOURCE)) {
-								tmp = Z_RES_VAL_P(tmp_val);
-							}
+							if (connection->id) {
+								tmp_val = zend_hash_index_find(&EG(regular_list), connection->id->handle);
+								if ((tmp_val != NULL) && (Z_TYPE_P(tmp_val) == IS_RESOURCE)) {
+									tmp = Z_RES_VAL_P(tmp_val);
+								}
 
-							if ((tmp_val != NULL) && (tmp != NULL) &&
-								(ZSTR_LEN(tmp->hash_key) == ZSTR_LEN(hashed_details.s)) &&
-								(memcmp(ZSTR_VAL(tmp->hash_key), ZSTR_VAL(hashed_details.s), ZSTR_LEN(tmp->hash_key)) == 0)) {
-								connection = tmp;
-								++GC_REFCOUNT(connection->id);
-								/* do nothing */
+								if ((tmp_val != NULL) && (tmp != NULL) &&
+									(ZSTR_LEN(tmp->hash_key) == ZSTR_LEN(hashed_details.s)) &&
+									(memcmp(ZSTR_VAL(tmp->hash_key), ZSTR_VAL(hashed_details.s),
+									 ZSTR_LEN(tmp->hash_key)) == 0)) {
+									connection = tmp;
+									++GC_REFCOUNT(connection->id);
+								}
 							} else {
 								PHP_OCI_REGISTER_RESOURCE(connection, le_pconnection);
 								/* Persistent connections: For old close semantics we artificially
@@ -2467,6 +2469,7 @@ 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;

ext/oci8/tests/bind_sqltnum.phpt

@@ -29,7 +29,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 function check_col($c, $colname, $id)
 {
-    $s = oci_parse($c, "select $colname from bind_sqltnum_tab where id = :id");
+    $s = oci_parse($c, "select dump($colname) from bind_sqltnum_tab where id = :id");
     oci_bind_by_name($s, ":id", $id);
     oci_execute($s);
     oci_fetch_all($s, $r);
@@ -198,81 +198,81 @@ Warning: oci_execute(): ORA-12899: %s "%s"."BIND_SQLTNUM_TAB"."VARCHAR2_T10" (%s
 
 TEST42 insert numbers SQLT_NUM
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    NULL
+    string(29) "Typ=2 Len=8: 42,0,0,0,0,0,0,0"
   }
 }
 
 TEST43 insert numbers SQLT_NUM
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    NULL
+    string(29) "Typ=2 Len=8: 42,0,0,0,0,0,0,0"
   }
 }
 
 TEST44
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    string(2) "-~"
+    string(28) "Typ=2 Len=8: 0,0,0,0,0,0,0,0"
   }
 }
 
 TEST45
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    NULL
+    string(44) "Typ=2 Len=8: 233,255,255,255,255,255,255,255"
   }
 }
 
 TEST46 insert numbers
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    NULL
+    string(44) "Typ=2 Len=8: 233,255,255,255,255,255,255,255"
   }
 }
 
 TEST47
 array(1) {
-  ["NUMBER_T"]=>
+  ["DUMP(NUMBER_T)"]=>
   array(1) {
     [0]=>
-    NULL
+    string(29) "Typ=2 Len=8: 23,0,0,0,0,0,0,0"
   }
 }
 
 TEST48
 array(1) {
-  ["NUMBER_T92"]=>
+  ["DUMP(NUMBER_T92)"]=>
   array(1) {
     [0]=>
-    string(1) "0"
+    string(16) "Typ=2 Len=1: 128"
   }
 }
 
 TEST49
 array(1) {
-  ["NUMBER_T92"]=>
+  ["DUMP(NUMBER_T92)"]=>
   array(1) {
     [0]=>
-    string(1) "0"
+    string(16) "Typ=2 Len=1: 128"
   }
 }
 
 TEST50
 
 Warning: oci_execute(): ORA-01438: %s in %sbind_sqltnum.php on line %d
 array(1) {
-  ["NUMBER_T92"]=>
+  ["DUMP(NUMBER_T92)"]=>
   array(0) {
   }
 }