diff options
| author | ULF WENDEL <uw@php.net> | 2012-09-29 09:56:55 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-09-29 09:56:55 +0200 |
| commit | 4969c7d50a0611a479f5cf93a2595a6c91c86006 (patch) | |
| tree | f2da450b0a2e381ea560473188eb145265af6a3f /ext/mysqlnd/mysqlnd_auth.c | |
| parent | a2098ca9eb0176a18cfdbf3b5b597f461d21ad8a (diff) | |
| parent | 5cf6334e847c3a78f28453b55d3c25537b03a8ff (diff) | |
| download | php-git-4969c7d50a0611a479f5cf93a2595a6c91c86006.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
sapi/litespeed/lsapi_main.c: Fix bug #63228
fix test
constify
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index f2c5adcc4d..3cae693de4 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -581,6 +581,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self if (conn->net->data->ssl) { + DBG_INF("simple clear text under SSL"); /* clear text under SSL */ *auth_data_len = passwd_len; ret = malloc(passwd_len); |