diff options
| author | Christopher Jones <sixd@php.net> | 2012-10-08 16:13:12 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-10-08 16:13:12 -0700 |
| commit | 6979632221feaba4a7f7a2b135b3d1b6942b56de (patch) | |
| tree | c2af672db314195985120a41c60af0a173747d45 /ext/mysqlnd/mysqlnd.c | |
| parent | 609e375e2f8084e4765992483166ad7c136e1349 (diff) | |
| parent | 6cd6a74c5a5b0eb503399848c814dd2f717b076b (diff) | |
| download | php-git-6979632221feaba4a7f7a2b135b3d1b6942b56de.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (54 commits)
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
Use zend_execute_internal always to call internal functions
use zend_execute_internal
exposing the libxpm version in phpinfo
update
5.4.9-dev
PHP-5.3 branch is 5.3.19 now
add a check for libmysql
if ssl has been switched on transmit clear-text password
reverted the previous fix for libpng include
fixed include checks for libpng under win
Avoding superfluous function call
Add test for #35895
Now we can set the tsrm_ls manually
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
add news for --offline
add --offline option to run-tests command
Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
...
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 3fa9d11a28..f5fe075c50 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -582,8 +582,8 @@ mysqlnd_run_authentication( scrambled_data = auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len, plugin_data, plugin_data_len, options, &conn->net->data->options, mysql_flags TSRMLS_CC); - if (!scrambled_data || conn->error_info->error_no) { - goto end; + if (conn->error_info->error_no) { + goto end; } if (FALSE == is_change_user) { ret = mysqlnd_auth_handshake(conn, user, passwd, passwd_len, db, db_len, options, mysql_flags, @@ -874,6 +874,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, saved_compression = TRUE; net->data->compressed = FALSE; } + if (net->data->ssl) { + net->data->ssl = FALSE; + } } else { unsigned int max_allowed_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; conn->m->set_client_option(conn, MYSQLND_OPT_MAX_ALLOWED_PACKET, (char *)&max_allowed_size TSRMLS_CC); |