diff options
| author | ULF WENDEL <uw@php.net> | 2012-10-22 13:35:06 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-10-22 13:35:06 +0200 |
| commit | 7d9114f2b2f271eeb43a910b310cc972f8b8368d (patch) | |
| tree | 505eb6fe98b26c6f59c8fcab41fdda75fed03ca6 /ext/mysqlnd/mysqlnd_auth.c | |
| parent | 917639d4631b456f8ffd959a3c523071c3e9c8b5 (diff) | |
| parent | 0afca669583cfcc8b80c3bd74353aff51e1da73f (diff) | |
| download | php-git-7d9114f2b2f271eeb43a910b310cc972f8b8368d.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (27 commits)
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
updated NEWS
update NEWS
updated NEWS
Fixed bug #63284 PCRE upgrade to 8.31
preg indenpent test script for #63055
Update libmagic.patch
Add fix & missing fix
Add fix & missing fix
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
add protection against core dumps if the underlying library returns 0x0 for some reason
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
...
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 3cae693de4..cdbdf6d7ed 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -555,8 +555,8 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, DBG_INF_FMT("Public key:%*.s", len, key_str); efree(key_str); } + php_stream_free(stream, PHP_STREAM_FREE_CLOSE); } - php_stream_free(stream, PHP_STREAM_FREE_CLOSE); } DBG_RETURN(ret); } |