diff options
Diffstat (limited to 'ext/mysqli')
26 files changed, 131 insertions, 451 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 73511b2639..b4a8b27fa4 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -200,7 +200,9 @@ static void mysqli_objects_free_storage(zend_object *object) mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; - my_efree(my_res); + if (my_res) { + efree(my_res); + } zend_object_std_dtor(&intern->zo); } /* }}} */ @@ -331,7 +333,7 @@ zval *mysqli_read_property(zval *object, zval *member, int type, void **cache_sl /* }}} */ /* {{{ mysqli_write_property */ -void mysqli_write_property(zval *object, zval *member, zval *value, void **cache_slot) +zval *mysqli_write_property(zval *object, zval *member, zval *value, void **cache_slot) { zval tmp_member; mysqli_object *obj; @@ -351,12 +353,14 @@ void mysqli_write_property(zval *object, zval *member, zval *value, void **cache if (hnd) { hnd->write_func(obj, value); } else { - zend_std_write_property(object, member, value, cache_slot); + value = zend_std_write_property(object, member, value, cache_slot); } if (member == &tmp_member) { zval_ptr_dtor_str(&tmp_member); } + + return value; } /* }}} */ @@ -1265,7 +1269,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags ZVAL_COPY_VALUE(&dataset, return_value); - object_and_properties_init(return_value, ce, NULL); + object_init_ex(return_value, ce); if (!ce->default_properties_count && !ce->__set) { Z_OBJ_P(return_value)->properties = Z_ARR(dataset); } else { @@ -1311,12 +1315,3 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags } } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 40c7d2982d..604b4b672d 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -967,17 +967,11 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) zval *result; /* it must be a reference, isn't it? */ if (Z_ISREF(stmt->result.vars[i])) { - result = Z_REFVAL(stmt->result.vars[i]); + result = stmt->result.vars[i]; } else { - result = &stmt->result.vars[i]; + continue; // but be safe ... } - /* - QQ: Isn't it quite better to call zval_dtor(). What if the user has - assigned a resource, or an array to the bound variable? We are going - to leak probably. zval_dtor() will handle also Unicode/Non-unicode mode. - */ /* Even if the string is of length zero there is one byte alloced so efree() in all cases */ - zval_ptr_dtor(result); if (!stmt->result.is_null[i]) { switch (stmt->result.buf[i].type) { case IS_LONG: @@ -998,16 +992,16 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) } while (--j > 0); tmp[10]= '\0'; /* unsigned int > INT_MAX is 10 digits - ALWAYS */ - ZVAL_STRINGL(result, tmp, 10); + ZEND_TRY_ASSIGN_STRINGL(result, tmp, 10); efree(tmp); break; } #endif } if (stmt->stmt->fields[i].flags & UNSIGNED_FLAG) { - ZVAL_LONG(result, *(unsigned int *)stmt->result.buf[i].val); + ZEND_TRY_ASSIGN_LONG(result, *(unsigned int *)stmt->result.buf[i].val); } else { - ZVAL_LONG(result, *(int *)stmt->result.buf[i].val); + ZEND_TRY_ASSIGN_LONG(result, *(int *)stmt->result.buf[i].val); } break; case IS_DOUBLE: @@ -1024,7 +1018,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) dval = *((double *)stmt->result.buf[i].val); } - ZVAL_DOUBLE(result, dval); + ZEND_TRY_ASSIGN_DOUBLE(result, dval); break; } case IS_STRING: @@ -1065,20 +1059,20 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) * use MYSQLI_LL_SPEC. */ snprintf(tmp, sizeof(tmp), (stmt->stmt->fields[i].flags & UNSIGNED_FLAG)? MYSQLI_LLU_SPEC : MYSQLI_LL_SPEC, llval); - ZVAL_STRING(result, tmp); + ZEND_TRY_ASSIGN_STRING(result, tmp); } else { - ZVAL_LONG(result, llval); + ZEND_TRY_ASSIGN_LONG(result, llval); } } else { #if defined(MYSQL_DATA_TRUNCATED) && MYSQL_VERSION_ID > 50002 if (ret == MYSQL_DATA_TRUNCATED && *(stmt->stmt->bind[i].error) != 0) { /* result was truncated */ - ZVAL_STRINGL(result, stmt->result.buf[i].val, stmt->stmt->bind[i].buffer_length); + ZEND_TRY_ASSIGN_STRINGL(result, stmt->result.buf[i].val, stmt->stmt->bind[i].buffer_length); } else { #else { #endif - ZVAL_STRINGL(result, stmt->result.buf[i].val, stmt->result.buf[i].output_len); + ZEND_TRY_ASSIGN_STRINGL(result, stmt->result.buf[i].val, stmt->result.buf[i].output_len); } } break; @@ -1086,7 +1080,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) break; } } else { - ZVAL_NULL(result); + ZEND_TRY_ASSIGN_NULL(result); } } } else { @@ -2682,12 +2676,3 @@ PHP_FUNCTION(mysqli_warning_count) RETURN_LONG(mysql_warning_count(mysql->mysql)); } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index 019e902391..5839c14827 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -153,13 +153,3 @@ const zend_function_entry mysqli_driver_methods[] = { PHP_FE_END }; /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c index 3e201c2e85..efc9a55852 100644 --- a/ext/mysqli/mysqli_embedded.c +++ b/ext/mysqli/mysqli_embedded.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -119,13 +119,3 @@ PHP_FUNCTION(mysqli_embedded_server_end) #endif } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index 4d1d39e814..6ac5261e07 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -72,13 +72,3 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, . zend_throw_exception_object(&sql_ex); } - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index bc5f3ecc6f..68c79c88dc 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -658,12 +658,3 @@ const zend_function_entry mysqli_stmt_methods[] = { PHP_FE_END }; /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h index 9dc038355f..0292dca64f 100644 --- a/ext/mysqli/mysqli_fe.h +++ b/ext/mysqli/mysqli_fe.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index a4ba66e15b..391fca9ff5 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/mysqli/mysqli_mysqlnd.h b/ext/mysqli/mysqli_mysqlnd.h index 3c2dd30260..4c6872cf1a 100644 --- a/ext/mysqli/mysqli_mysqlnd.h +++ b/ext/mysqli/mysqli_mysqlnd.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 7b6c07d2e3..a69fb63d6a 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -155,7 +155,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne mysql->hash_key = hash_key; - /* check if we can reuse exisiting connection ... */ + /* check if we can reuse existing connection ... */ if ((le = zend_hash_find_ptr(&EG(persistent_list), hash_key)) != NULL) { if (le->type == php_le_pmysqli()) { plist = (mysqli_plist_entry *) le->ptr; @@ -1206,13 +1206,3 @@ PHP_FUNCTION(mysqli_get_links_stats) add_assoc_long_ex(return_value, "cached_plinks", sizeof("cached_plinks") - 1, MyG(num_inactive_persistent)); } /* }}} */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h index de3f5f058d..af5d4fe2a6 100644 --- a/ext/mysqli/mysqli_priv.h +++ b/ext/mysqli/mysqli_priv.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 160ec551e0..25985927dc 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -466,12 +466,3 @@ const mysqli_property_entry mysqli_stmt_property_entries[] = { {"id", sizeof("id") - 1, stmt_id_read, NULL}, {NULL, 0, NULL, NULL} }; - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index 3b842aea4c..330e5a6f70 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -65,12 +65,3 @@ void php_mysqli_report_index(const char *query, unsigned int status) { php_mysqli_throw_sql_exception("00000", 0, "%s used in query/prepared statement %s", index, query); } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c index 9b42094345..704c67f5c2 100644 --- a/ext/mysqli/mysqli_result_iterator.c +++ b/ext/mysqli/mysqli_result_iterator.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -154,12 +154,3 @@ const zend_object_iterator_funcs php_mysqli_result_iterator_funcs = { NULL }; /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index 0170dec4bb..248d9a281f 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -323,13 +323,3 @@ const mysqli_property_entry mysqli_warning_property_entries[] = { {NULL, 0, NULL, NULL} }; /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index abe66cbd46..64a979d3fd 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -28,13 +28,3 @@ extern zend_module_entry mysqli_module_entry; #define PHP_MYSQLI_VERSION PHP_VERSION #endif /* PHP_MYSQLI.H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 1b7ffddb1a..b309c21070 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -342,20 +342,6 @@ ZEND_END_MODULE_GLOBALS(mysqli) ZEND_TSRMLS_CACHE_EXTERN() #endif -#define my_estrdup(x) (x) ? estrdup(x) : NULL -#define my_efree(x) if (x) efree(x) - ZEND_EXTERN_MODULE_GLOBALS(mysqli) #endif /* PHP_MYSQLI_STRUCTS.H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/tests/cacert.pem b/ext/mysqli/tests/cacert.pem deleted file mode 100644 index a0ba67444e..0000000000 --- a/ext/mysqli/tests/cacert.pem +++ /dev/null @@ -1,79 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 16263805969935345171 (0xe1b4a55c3ddfa613) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA - Validity - Not Before: Dec 5 04:48:11 2014 GMT - Not After : Dec 1 04:48:11 2030 GMT - Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:b4:95:bd:24:92:73:06:22:01:13:28:0e:09:a3: - 94:05:96:54:9d:dc:8f:83:39:f3:64:7a:31:70:f6: - d9:c4:14:19:75:87:a6:b1:ea:52:ed:40:54:5a:f6: - 9c:13:8e:d8:76:8f:5a:65:a5:20:19:19:bd:51:9d: - ba:35:ce:9a:a9:58:0a:fc:11:6e:1d:cb:a8:f1:92: - 79:ee:aa:fc:e3:32:5e:aa:0d:0b:23:34:95:e9:d3: - 8e:3f:72:93:90:bc:2c:b0:04:75:4f:a4:4a:a0:32: - db:ac:89:ac:34:9b:d0:07:e3:81:e9:ca:5b:26:f0: - f5:de:fe:d5:5e:a0:54:26:dd:ec:58:07:6e:b9:e5: - 97:f6:20:6d:d8:4a:c0:50:cc:81:e6:d2:3f:c7:47: - 70:8b:15:89:65:71:2e:47:c3:42:76:b5:ee:16:0e: - 26:97:6a:a3:1c:ad:90:53:50:b0:b1:6d:1d:b0:b8: - 6d:df:3c:ee:bd:3b:87:e8:db:4d:3a:72:78:dd:db: - 40:3d:c9:20:46:b8:4e:33:bb:76:b7:4f:b2:79:da: - 03:cc:f9:75:c0:1d:4c:51:0a:b9:9b:25:34:50:11: - 97:df:82:46:02:a9:bc:98:51:3e:c3:df:57:ad:b7: - 28:be:de:65:ce:2b:f3:2c:22:f5:af:31:28:1c:ef: - 10:09 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - 94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2 - X509v3 Authority Key Identifier: - keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: sha256WithRSAEncryption - 32:97:4c:af:bf:ca:e0:10:66:b7:cc:8b:0d:05:d1:d2:ca:b8: - 0c:c2:78:57:1f:f6:55:9c:74:fc:bd:31:58:05:18:bc:6d:b5: - 79:9a:22:8c:1f:da:33:ea:ef:db:e3:cb:46:bc:36:91:8b:d8: - 36:8d:06:40:c2:e9:fe:79:1b:4a:c5:70:74:6d:9d:92:2c:90: - be:3c:a7:88:03:e4:b7:ef:f4:b0:00:34:ec:8f:d1:c3:23:2b: - ef:bc:ff:ab:a2:0e:bc:ba:11:a5:8e:44:80:fa:d6:f4:26:66: - 84:64:2c:e3:23:62:0c:e2:ba:01:ab:5f:24:d6:9d:7e:9c:7b: - f4:5d:0e:ba:64:35:6e:a5:fa:98:0c:57:f3:72:e8:3e:2e:ce: - b3:f9:e3:fa:ee:aa:79:f9:06:01:19:b2:b3:28:ff:f4:d6:bb: - 17:bb:a6:a0:e0:45:23:f3:61:40:31:5c:a3:ee:88:1c:00:31: - 54:96:f9:71:37:b5:7f:66:6a:af:04:94:09:39:99:b3:88:86: - 9e:bb:d6:36:24:24:f4:37:2c:a6:6c:0b:35:2e:bb:40:af:a7: - 64:8a:7f:f2:74:e3:94:0c:32:bd:31:3d:d9:79:68:0f:1e:4b: - 17:c0:4e:df:85:3c:f0:84:df:58:f1:d2:4d:2f:ad:ff:1b:d7: - c8:9b:fe:dc ------BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIJAOG0pVw936YTMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV -BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP -MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN -MTQxMjA1MDQ0ODExWhcNMzAxMjAxMDQ0ODExWjBjMQswCQYDVQQGEwJTRTESMBAG -A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y -YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEAtJW9JJJzBiIBEygOCaOUBZZUndyPgznzZHoxcPbZ -xBQZdYemsepS7UBUWvacE47Ydo9aZaUgGRm9UZ26Nc6aqVgK/BFuHcuo8ZJ57qr8 -4zJeqg0LIzSV6dOOP3KTkLwssAR1T6RKoDLbrImsNJvQB+OB6cpbJvD13v7VXqBU -Jt3sWAduueWX9iBt2ErAUMyB5tI/x0dwixWJZXEuR8NCdrXuFg4ml2qjHK2QU1Cw -sW0dsLht3zzuvTuH6NtNOnJ43dtAPckgRrhOM7t2t0+yedoDzPl1wB1MUQq5myU0 -UBGX34JGAqm8mFE+w99Xrbcovt5lzivzLCL1rzEoHO8QCQIDAQABo1AwTjAdBgNV -HQ4EFgQUlGWho4fPv8F0u9iEl7Zr7rKQc7IwHwYDVR0jBBgwFoAUlGWho4fPv8F0 -u9iEl7Zr7rKQc7IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMpdM -r7/K4BBmt8yLDQXR0sq4DMJ4Vx/2VZx0/L0xWAUYvG21eZoijB/aM+rv2+PLRrw2 -kYvYNo0GQMLp/nkbSsVwdG2dkiyQvjyniAPkt+/0sAA07I/RwyMr77z/q6IOvLoR -pY5EgPrW9CZmhGQs4yNiDOK6AatfJNadfpx79F0OumQ1bqX6mAxX83LoPi7Os/nj -+u6qefkGARmysyj/9Na7F7umoOBFI/NhQDFco+6IHAAxVJb5cTe1f2ZqrwSUCTmZ -s4iGnrvWNiQk9DcspmwLNS67QK+nZIp/8nTjlAwyvTE92XloDx5LF8BO34U88ITf -WPHSTS+t/xvXyJv+3A== ------END CERTIFICATE----- diff --git a/ext/mysqli/tests/client-cert.pem b/ext/mysqli/tests/client-cert.pem deleted file mode 100644 index f60a088417..0000000000 --- a/ext/mysqli/tests/client-cert.pem +++ /dev/null @@ -1,82 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 16263805969935345173 (0xe1b4a55c3ddfa615) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA - Validity - Not Before: Dec 5 04:49:23 2014 GMT - Not After : Dec 1 04:49:23 2029 GMT - Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:c8:d1:a1:fe:a4:8c:f3:1b:17:71:1b:74:35:11: - e0:0e:6c:40:0a:fb:c0:f7:f0:eb:bb:c9:1d:a1:c7: - d7:b0:8a:f6:f1:cf:fa:6b:d0:79:64:eb:bb:69:a5: - 0d:80:06:df:52:14:d2:85:32:cf:bf:ce:2a:47:28: - 5b:cd:0b:28:ab:bb:07:33:d5:8b:d3:b4:72:c4:a6: - b5:cc:37:b9:03:a8:78:56:25:58:1f:17:30:7c:d1: - 0a:bb:ec:3c:a3:03:90:97:99:92:49:ae:b3:57:96: - 5c:1a:e9:e8:02:23:ae:c8:c9:05:50:63:e5:77:a1: - 9a:73:06:74:0e:46:50:28:d8:c9:4f:c4:1c:37:b8: - 52:18:0b:af:19:2b:d4:e5:66:74:a4:f3:f0:da:09: - 30:f7:bc:0c:c9:9b:ce:57:06:04:27:e5:a1:2f:2b: - a0:ba:b7:99:69:9d:46:fc:21:b6:45:81:9d:b2:3d: - 2f:76:15:78:b5:33:62:ac:1e:6b:66:dd:27:61:0a: - 47:02:20:2b:57:bb:32:20:dd:06:4c:76:a4:9b:72: - 42:4c:9c:2c:76:72:12:1f:4b:df:1e:11:1f:a9:06: - 54:dc:88:12:b0:49:d5:40:83:ef:7e:48:43:86:7a: - 37:a6:c1:d7:9b:fe:08:34:98:e0:54:3c:30:4f:79: - 15:29 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 26:0C:90:BC:97:12:9E:43:BB:5E:FE:EB:A9:66:B3:C3:EE:B2:18:CB - X509v3 Authority Key Identifier: - keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2 - - Signature Algorithm: sha256WithRSAEncryption - 3e:3c:1f:6c:5b:83:d1:71:15:f5:45:52:fc:7f:67:bc:af:c5: - 92:f5:74:78:13:43:3c:fe:b5:61:bf:00:47:43:45:a0:b9:dd: - a1:10:0c:29:69:2a:6f:7d:67:3d:1e:09:b5:15:74:bf:73:11: - e6:e9:09:b6:6b:b5:cc:1e:06:fd:bd:3a:11:d3:44:bd:ca:7a: - a1:f1:09:43:fc:bf:83:89:3a:b1:18:40:f3:cf:6d:12:ef:6e: - 0c:b7:a4:99:03:8a:4f:0c:3c:2c:23:78:35:2a:99:ea:de:9c: - 1b:e8:8d:19:fb:44:80:13:89:81:c5:05:4b:a7:66:6b:c0:31: - 41:f0:6c:60:aa:ec:d3:4c:ff:c1:3b:d5:bb:0d:42:7d:37:5e: - 80:e7:9c:7e:60:90:0f:a4:4e:70:20:9c:b1:e4:1b:70:65:b0: - ef:bb:41:16:ed:ad:46:ce:34:d3:02:3d:dd:e2:50:fa:3c:5d: - f0:e2:71:f8:9a:ef:a3:32:25:c5:8e:64:f4:46:e1:f4:c0:69: - d2:34:56:8d:d9:c2:6e:b6:55:3b:6a:4d:b6:d2:84:ab:85:7b: - cb:fd:b4:73:40:ba:5d:49:e2:0d:39:77:17:01:49:bb:72:8b: - 3a:c9:b1:e2:cd:13:d2:9c:ce:7d:6c:a8:f0:32:c9:a4:af:56: - 6f:8a:e6:88 ------BEGIN CERTIFICATE----- -MIIDyDCCArCgAwIBAgIJAOG0pVw936YVMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV -BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP -MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN -MTQxMjA1MDQ0OTIzWhcNMjkxMjAxMDQ0OTIzWjBnMQswCQYDVQQGEwJTRTESMBAG -A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y -YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBkNsaWVudDCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAMjRof6kjPMbF3EbdDUR4A5sQAr7wPfw67vJ -HaHH17CK9vHP+mvQeWTru2mlDYAG31IU0oUyz7/OKkcoW80LKKu7BzPVi9O0csSm -tcw3uQOoeFYlWB8XMHzRCrvsPKMDkJeZkkmus1eWXBrp6AIjrsjJBVBj5XehmnMG -dA5GUCjYyU/EHDe4UhgLrxkr1OVmdKTz8NoJMPe8DMmbzlcGBCfloS8roLq3mWmd -RvwhtkWBnbI9L3YVeLUzYqwea2bdJ2EKRwIgK1e7MiDdBkx2pJtyQkycLHZyEh9L -3x4RH6kGVNyIErBJ1UCD735IQ4Z6N6bB15v+CDSY4FQ8ME95FSkCAwEAAaN7MHkw -CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy -dGlmaWNhdGUwHQYDVR0OBBYEFCYMkLyXEp5Du17+66lms8PushjLMB8GA1UdIwQY -MBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQA+PB9s -W4PRcRX1RVL8f2e8r8WS9XR4E0M8/rVhvwBHQ0Wgud2hEAwpaSpvfWc9Hgm1FXS/ -cxHm6Qm2a7XMHgb9vToR00S9ynqh8QlD/L+DiTqxGEDzz20S724Mt6SZA4pPDDws -I3g1Kpnq3pwb6I0Z+0SAE4mBxQVLp2ZrwDFB8GxgquzTTP/BO9W7DUJ9N16A55x+ -YJAPpE5wIJyx5BtwZbDvu0EW7a1GzjTTAj3d4lD6PF3w4nH4mu+jMiXFjmT0RuH0 -wGnSNFaN2cJutlU7ak220oSrhXvL/bRzQLpdSeINOXcXAUm7cos6ybHizRPSnM59 -bKjwMsmkr1ZviuaI ------END CERTIFICATE----- diff --git a/ext/mysqli/tests/client-key.pem b/ext/mysqli/tests/client-key.pem deleted file mode 100644 index e0aae4f2c4..0000000000 --- a/ext/mysqli/tests/client-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAyNGh/qSM8xsXcRt0NRHgDmxACvvA9/Dru8kdocfXsIr28c/6 -a9B5ZOu7aaUNgAbfUhTShTLPv84qRyhbzQsoq7sHM9WL07RyxKa1zDe5A6h4ViVY -HxcwfNEKu+w8owOQl5mSSa6zV5ZcGunoAiOuyMkFUGPld6GacwZ0DkZQKNjJT8Qc -N7hSGAuvGSvU5WZ0pPPw2gkw97wMyZvOVwYEJ+WhLyugureZaZ1G/CG2RYGdsj0v -dhV4tTNirB5rZt0nYQpHAiArV7syIN0GTHakm3JCTJwsdnISH0vfHhEfqQZU3IgS -sEnVQIPvfkhDhno3psHXm/4INJjgVDwwT3kVKQIDAQABAoIBAFrliE2abbIcMSAh -LRhYXvIoTVSrX0za39i/z4nKyvY98EjDurXSRyBHEy1eaB3q/mpIwoFH3oES8FAF -FIha5K3Wmgv8PK42nzwjuWYWUsg1GULk5F4uQOQ+On2VEF0439m+yVhQmxyqEkac -WUeenx6C3sTkcpkTrLUj1qQfb2kM6JmeGsXfJNFLP/U36x8Q6kp2089DxBFgVcFu -W3ge24W08umDBKuZWIF5B9GX8JFzmbAwPT2KATppGeroX0+bo4KAts4F1dBKmbrm -3815kqYnz+VqyWbw6AHUA7aw2TY6QIT1oHrm+EdfnOQZaf8d/2CHWlIZPmxB46Lz -6zQTVgECgYEA/L9awju31alISm0WYOPZBBndIHsOve4iKcMmy85GTKSvV+cAvgAZ -uQwabZi4ZYHYaa4LPF0hbTb5IdV6krQzGYXpAjlwaarW0Zx4VoQIErWyji79OnFD -QpbzIPGQiUAc0D7Gk7kJpwNmpgjyYcSkjEibF4cFEhDpTVlccbgxboUCgYEAy2c0 -tIfKiu1hwo/8UdcO4LQ6LWJdbIDdNU45HCk/IhIe4FrB0pXnk1yIBBn0ezY7Mgzy -USYlfPTjFmnQOFF/6bHyGmeB4YTYamlTDuHlUUdH76brCZ3ywUlqpToiAPJFjx36 -nTNjo8JLF7eyjMOy4uN6eJzzS7OP9GwsHllux1UCgYBeFLCo+me8va2uHpsk58th -TmtUatoa8uh+mSj41kiuwOKQGunYz9rDWfEAeMey6TlwZRvDlXsa10q3QGrG7xLS -XllUvaLNgo1CKzdUJQOIS2AysuUJ+x0pTV0lFyZRIK9ZCPUMCeXA6HAuP8hRgkwp -9+DbSiQmDGt7olbZ8dFcrQKBgQCOFzzUWH//aTD/z8H+EfQMuRpjFfIZmDPvxwNS -TuYRkQMMy5nW2G17ngpOgyss34eewTiNw84waoow4B5bGWP4Bx0PoPs0Za8hNw6U -uO2PR/JS0hIjF7m7mOPtJJ0YeCZrgg/OvVV/0nzOxr7uYs+WfD7T/yBe48NOhjqT -wPoIOQKBgGRLd3G8b0AbPTv4NVwzIl3xKHCKYd1EcBbfyPWjAZ8+BagEPK8mJfOt -MXkMrSKOq6ShEfzRsdJna7eI0te3zNXXFu/G3IHQZUdC0RtksW5T9tXvASRN3wnX -+aaoIM1q/KUgfH0TF/1pQPHFSUfFrGyLDiCDUu1sJ2ijULr5rZES ------END RSA PRIVATE KEY----- diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt index 11c3492817..7b6c0a65d9 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt @@ -40,7 +40,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'client_version' isPublic: yes @@ -48,7 +48,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'driver_version' isPublic: yes @@ -56,7 +56,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'embedded' isPublic: yes @@ -64,7 +64,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'reconnect' isPublic: yes @@ -72,7 +72,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'report_mode' isPublic: yes @@ -80,7 +80,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Default property 'client_info' Default property 'client_version' Default property 'driver_version' diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index 9247721e43..ad69e3a334 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -49,7 +49,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 6 Number of Required Parameters: 0 @@ -107,7 +107,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 6 Number of Required Parameters: 0 @@ -165,7 +165,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -188,7 +188,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 0 @@ -218,7 +218,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 3 Number of Required Parameters: 3 @@ -255,7 +255,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -271,7 +271,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -287,7 +287,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 0 @@ -317,7 +317,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 6 Number of Required Parameters: 0 @@ -375,7 +375,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -398,7 +398,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -414,7 +414,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -437,7 +437,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -453,7 +453,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -469,7 +469,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -485,7 +485,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -501,7 +501,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -517,7 +517,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -533,7 +533,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -556,7 +556,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -572,7 +572,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -595,7 +595,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -611,7 +611,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 2 @@ -641,7 +641,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -657,7 +657,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 257 +Modifiers: 17 Number of Parameters: 5 Number of Required Parameters: 4 @@ -708,7 +708,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -731,7 +731,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 1 @@ -761,7 +761,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 7 Number of Required Parameters: 0 @@ -826,7 +826,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -849,7 +849,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -872,7 +872,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -888,7 +888,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -911,7 +911,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -934,7 +934,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 0 @@ -964,7 +964,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -987,7 +987,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -1010,7 +1010,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -1033,7 +1033,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 2 @@ -1063,7 +1063,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 5 Number of Required Parameters: 5 @@ -1114,7 +1114,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -1130,7 +1130,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -1146,7 +1146,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 0 @@ -1169,7 +1169,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -1185,7 +1185,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -1195,7 +1195,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'client_info' isPublic: yes @@ -1203,7 +1203,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'client_version' isPublic: yes @@ -1211,7 +1211,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'connect_errno' isPublic: yes @@ -1219,7 +1219,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'connect_error' isPublic: yes @@ -1227,7 +1227,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'errno' isPublic: yes @@ -1235,7 +1235,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'error' isPublic: yes @@ -1243,7 +1243,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'error_list' isPublic: yes @@ -1251,7 +1251,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'field_count' isPublic: yes @@ -1259,7 +1259,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'host_info' isPublic: yes @@ -1267,7 +1267,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'info' isPublic: yes @@ -1275,7 +1275,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'insert_id' isPublic: yes @@ -1283,7 +1283,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'protocol_version' isPublic: yes @@ -1291,7 +1291,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'server_info' isPublic: yes @@ -1299,7 +1299,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'server_version' isPublic: yes @@ -1307,7 +1307,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'sqlstate' isPublic: yes @@ -1315,7 +1315,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'stat' isPublic: yes @@ -1323,7 +1323,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'thread_id' isPublic: yes @@ -1331,7 +1331,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'warning_count' isPublic: yes @@ -1339,7 +1339,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Default property 'affected_rows' Default property 'client_info' Default property 'client_version' diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt index ee2765c4dc..52b984fa15 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt @@ -49,7 +49,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -65,7 +65,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -81,7 +81,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -97,7 +97,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -120,7 +120,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 0 @@ -143,7 +143,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 0 @@ -166,7 +166,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -182,7 +182,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -198,7 +198,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -221,7 +221,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -237,7 +237,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 2 Number of Required Parameters: 0 @@ -267,7 +267,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -283,7 +283,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 1 Number of Required Parameters: 1 @@ -306,7 +306,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -322,7 +322,7 @@ isDestructor: no isInternal: yes isUserDefined: no returnsReference: no -Modifiers: 256 +Modifiers: 1 Number of Parameters: 0 Number of Required Parameters: 0 @@ -332,7 +332,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'field_count' isPublic: yes @@ -340,7 +340,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'lengths' isPublic: yes @@ -348,7 +348,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'num_rows' isPublic: yes @@ -356,7 +356,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'type' isPublic: yes @@ -364,7 +364,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Default property 'current_field' Default property 'field_count' Default property 'lengths' diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt index 8ad12737a7..3344bb479f 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt @@ -90,7 +90,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'message' isPublic: yes @@ -98,7 +98,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Inspecting property 'sqlstate' isPublic: yes @@ -106,7 +106,7 @@ isPrivate: no isProtected: no isStatic: no isDefault: yes -Modifiers: 256 +Modifiers: 1 Default property 'errno' Default property 'message' Default property 'sqlstate' diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index 5fd62d0c6b..24cfae7a9a 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -179,7 +179,7 @@ if (!have_innodb($link)) if ($parent_row != $client_row) { printf("[015] Child indicates different results than parent.\n"); - var_dump($child_row); + var_dump($client_row); var_dump($parent_row); if (!mysqli_query($plink, sprintf($parent_sql, 'stop'))) { printf("[016] Parent cannot inform child\n", mysqli_errno($plink), mysqli_error($plink)); diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index 8f2a13b96c..15fc21c16a 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -1,9 +1,7 @@ --TEST-- mysqli_rollback() --SKIPIF-- -<?php ?> -<?php ?> -<?PHP +<?php require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); |