diff options
| author | andrey <andrey@php.net> | 2012-09-25 14:04:36 +0200 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-09-25 14:04:36 +0200 |
| commit | 571b46bff68925f15f578147278b43c6f88083f0 (patch) | |
| tree | 101cf8e3f35f89acb3290e07ca5712b93a8aae09 /ext/mysqli/mysqli_nonapi.c | |
| parent | 8a930c93dd673b9f13350590a7b6e3a1a5ce4431 (diff) | |
| download | php-git-571b46bff68925f15f578147278b43c6f88083f0.tar.gz | |
Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 5e9c01378a..2b6a1af0ed 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -728,7 +728,7 @@ static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, z int ret = 0; ALLOC_HASHTABLE(new_hash); - zend_hash_init(new_hash, zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)), NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(new_hash, in_zval_array? zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)):0, NULL, ZVAL_PTR_DTOR, 0); if (in_array) { for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(in_zval_array)); zend_hash_get_current_data(Z_ARRVAL_P(in_zval_array), (void **) &elem) == SUCCESS; |