com php-src: merge: ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Fri, 29 Jun 2012 13:58:53 +0000 |
| Subject: | com php-src: merge: ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69495@lists.php.net to get a copy of this message | ||
Commit: c51fbbe4b4e2c047d1be76d8bffc6391203adbdd
Author: andrey <andrey@php.net> Fri, 29 Jun 2012 16:58:53 +0300
Parents: 2abf2738f4f5b271b6a2dff3bcb767ac292c40f7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c51fbbe4b4e2c047d1be76d8bffc6391203adbdd
Log:
merge
Changed paths:
M ext/mysqlnd/mysqlnd.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index cc3a391..417ff5e 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -789,6 +789,13 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn,
conn->server_version = mnd_pestrdup(greet_packet->server_version, conn->persistent);
conn->greet_charset = mysqlnd_find_charset_nr(greet_packet->charset_no);
+ if (!conn->greet_charset) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Server sent charset (%d) unknown to the client. Please, report to the developers",
greet_packet->charset_no);
+ SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE,
+ "Server sent charset unknown to the client. Please, report to the developers");
+ goto err;
+ }
if (FAIL == mysqlnd_connect_run_authentication(conn, user, passwd, db, db_len, (size_t)
passwd_len,
greet_packet, conn->options, mysql_flags TSRMLS_CC))