From: Andrey Hristov <andrey@php.net>
Date: Tue, 10 Nov 2015 12:02:26 +0000 (+0100)
Subject: MNDR:
X-Git-Tag: php-7.1.0alpha1~761
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f0a542d047f023ef6575a8cbd3e9edad64a040e;p=php

MNDR:
- route the option to the right handler
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 9e627782bc..65b69c8507 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2104,7 +2104,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c
 		goto end;
 	}
 	switch (option) {
-		case MYSQL_OPT_COMPRESS:
 #ifdef WHEN_SUPPORTED_BY_MYSQLI
 		case MYSQL_OPT_READ_TIMEOUT:
 		case MYSQL_OPT_WRITE_TIMEOUT:
@@ -2120,6 +2119,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c
 		case MYSQLND_OPT_NET_READ_BUFFER_SIZE:
 			ret = conn->vio->data->m.set_client_option(conn->vio, option, value);
 			break;
+		case MYSQL_OPT_COMPRESS:
 		case MYSQL_SERVER_PUBLIC_KEY:
 			ret = conn->protocol_frame_codec->data->m.set_client_option(conn->protocol_frame_codec, option, value);
 			break;