reorganize things a bit...just shifting code

diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 3f332aea0d512f96f290217058ccb5ff4ce134a0..b2fe662bbf261786416bed70477788ea905bc420 100644 (file)
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -266,8 +266,15 @@ MYSQLND_METHOD(mysqlnd_net, get_open_stream)(MYSQLND_NET * const net, const char
 {
        func_mysqlnd_net__open_stream ret = NULL;
        DBG_ENTER("mysqlnd_net::get_open_stream");
-       ret = (scheme_len > (sizeof("pipe://") - 1) && !memcmp(scheme, "pipe://", sizeof("pipe://") - 1))? net->data->m.open_pipe:
-                                                                                                                                                                                                          net->data->m.open_tcp_or_unix;
+       if (scheme_len > (sizeof("pipe://") - 1) && !memcmp(scheme, "pipe://", sizeof("pipe://") - 1)) {
+               ret = net->data->m.open_pipe;
+       } else if ((scheme_len > (sizeof("tcp://") - 1) && !memcmp(scheme, "tcp://", sizeof("tcp://") - 1))
+                               ||
+                               (scheme_len > (sizeof("unix://") - 1) && !memcmp(scheme, "unix://", sizeof("unix://") - 1)))
+       {
+               ret = net->data->m.open_tcp_or_unix;
+       }
+
        if (!ret) {
                SET_CLIENT_ERROR(*error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, "No handler for this scheme");
        }       
@@ -514,7 +521,7 @@ MYSQLND_METHOD(mysqlnd_net, read_compressed_packet_from_stream_and_fill_read_buf
                (MYSQLND_NET * net, size_t net_payload_size, MYSQLND_STATS * conn_stats, MYSQLND_ERROR_INFO * error_info TSRMLS_DC)
 {
        size_t decompressed_size;
-       enum_func_status ret = PASS;
+       enum_func_status retval = PASS;
        zend_uchar * compressed_data = NULL;
        zend_uchar comp_header[COMPRESSED_HEADER_SIZE];
        DBG_ENTER("mysqlnd_net::read_compressed_packet_from_stream_and_fill_read_buffe");
@@ -531,19 +538,19 @@ MYSQLND_METHOD(mysqlnd_net, read_compressed_packet_from_stream_and_fill_read_buf
        if (decompressed_size) {
                compressed_data = mnd_emalloc(net_payload_size);
                if (FAIL == net->data->m.network_read_ex(net, compressed_data, net_payload_size, conn_stats, error_info TSRMLS_CC)) {
-                       ret = FAIL;
+                       retval = FAIL;
                        goto end;
                }
                net->uncompressed_data = mysqlnd_create_read_buffer(decompressed_size TSRMLS_CC);
-               ret = net->data->m.decode(net->uncompressed_data->data, decompressed_size, compressed_data, net_payload_size TSRMLS_CC);
-               if (ret == FAIL) {
+               retval = net->data->m.decode(net->uncompressed_data->data, decompressed_size, compressed_data, net_payload_size TSRMLS_CC);
+               if (FAIL == retval) {
                        goto end;
                }
        } else {
                DBG_INF_FMT("The server decided not to compress the data. Our job is easy. Copying %u bytes", net_payload_size);
                net->uncompressed_data = mysqlnd_create_read_buffer(net_payload_size TSRMLS_CC);
                if (FAIL == net->data->m.network_read_ex(net, net->uncompressed_data->data, net_payload_size, conn_stats, error_info TSRMLS_CC)) {
-                       ret = FAIL;
+                       retval = FAIL;
                        goto end;
                }
        }
@@ -551,7 +558,7 @@ end:
        if (compressed_data) {
                mnd_efree(compressed_data);
        }
-       DBG_RETURN(ret);
+       DBG_RETURN(retval);
 }
 /* }}} */
 #endif /* MYSQLND_COMPRESSION_ENABLED */
@@ -909,6 +916,7 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net TSRMLS_DC)
        DBG_RETURN(PASS);
 #else
        DBG_ENTER("mysqlnd_net::enable_ssl");
+       DBG_INFO("MYSQLND_SSL_SUPPORTED is not defined");
        DBG_RETURN(PASS);
 #endif
 }
@@ -1069,8 +1077,9 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_net)
        MYSQLND_METHOD(mysqlnd_net, close_stream),
        MYSQLND_METHOD(mysqlnd_net, open_pipe),
        MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix),
-       NULL, /* unused 1 */
-       NULL, /* unused 2 */
+       MYSQLND_METHOD(mysqlnd_net, get_stream),
+       MYSQLND_METHOD(mysqlnd_net, set_stream),
+       MYSQLND_METHOD(mysqlnd_net, get_open_stream),
        MYSQLND_METHOD(mysqlnd_net, post_connect_set_opt),
        MYSQLND_METHOD(mysqlnd_net, set_client_option),
        MYSQLND_METHOD(mysqlnd_net, decode),
@@ -1088,9 +1097,11 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_net)
 #else
        NULL,
 #endif
-       MYSQLND_METHOD(mysqlnd_net, get_stream),
-       MYSQLND_METHOD(mysqlnd_net, set_stream),
-       MYSQLND_METHOD(mysqlnd_net, get_open_stream)
+       NULL, /* unused 1 */
+       NULL, /* unused 2 */
+       NULL, /* unused 3 */
+       NULL, /* unused 4 */
+       NULL  /* unused 5 */
 MYSQLND_CLASS_METHODS_END;
 
 

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 7b8386a3f6596db49a5e2034598b1eb497e3f428..6dcb8b36dd31c0822feb83e8a8bfb56258c1458b 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -284,11 +284,11 @@ typedef void                              (*func_mysqlnd_net__dtor)(MYSQLND_NET * const net, MYSQLND_STATS
 typedef enum_func_status       (*func_mysqlnd_net__connect_ex)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, const zend_bool persistent, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
 typedef void                           (*func_mysqlnd_net__close_stream)(MYSQLND_NET * const net, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
 typedef enum_func_status       (*func_mysqlnd_net__open_stream)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, const zend_bool persistent, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
-typedef void                           (*func_mysqlnd_net__post_connect_set_opt)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
-typedef enum_func_status       (*func_mysqlnd_net__read_compressed_packet_from_stream_and_fill_read_buffer)(MYSQLND_NET * net, size_t net_payload_size, MYSQLND_STATS * conn_stats, MYSQLND_ERROR_INFO * error_info TSRMLS_DC);
 typedef php_stream *           (*func_mysqlnd_net__get_stream)(const MYSQLND_NET * const net TSRMLS_DC);
 typedef php_stream *           (*func_mysqlnd_net__set_stream)(MYSQLND_NET * const net, php_stream * net_stream TSRMLS_DC);
 typedef func_mysqlnd_net__open_stream (*func_mysqlnd_net__get_open_stream)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
+typedef void                           (*func_mysqlnd_net__post_connect_set_opt)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC);
+typedef enum_func_status       (*func_mysqlnd_net__read_compressed_packet_from_stream_and_fill_read_buffer)(MYSQLND_NET * net, size_t net_payload_size, MYSQLND_STATS * conn_stats, MYSQLND_ERROR_INFO * error_info TSRMLS_DC);
 
 struct st_mysqlnd_net_methods
 {
@@ -299,8 +299,10 @@ struct st_mysqlnd_net_methods
        func_mysqlnd_net__open_stream open_pipe;
        func_mysqlnd_net__open_stream open_tcp_or_unix;
 
-       void * unused1;
-       void * unused2;
+       func_mysqlnd_net__get_stream get_stream;
+       func_mysqlnd_net__set_stream set_stream;
+       func_mysqlnd_net__get_open_stream get_open_stream;
+
        func_mysqlnd_net__post_connect_set_opt post_connect_set_opt;
 
        func_mysqlnd_net__set_client_option set_client_option;
@@ -318,11 +320,11 @@ struct st_mysqlnd_net_methods
 
        func_mysqlnd_net__read_compressed_packet_from_stream_and_fill_read_buffer read_compressed_packet_from_stream_and_fill_read_buffer;
 
-       func_mysqlnd_net__get_stream get_stream;
-       func_mysqlnd_net__set_stream set_stream;
-       func_mysqlnd_net__get_open_stream get_open_stream;
-       void * unused6;
-       void * unused7;
+       void * unused1;
+       void * unused2;
+       void * unused3;
+       void * unused4;
+       void * unused5;
 };