From 6f64d5509c766767a6ce839bb0ae7bdf0d7dc034 Mon Sep 17 00:00:00 2001
From: unknown <tonu@hundin.mysql.fi>
Date: Tue, 5 Jun 2001 02:28:33 +0300
Subject: [PATCH] vio.c Vio code bugfix violite.h Code cleanup
include/violite.h:
Code cleanup
vio/vio.c:
Vio code bugfix
---
include/violite.h | 3 ---
vio/vio.c | 12 +++++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/violite.h b/include/violite.h
index a88b5c0db51..ffef4d68c73 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -210,9 +210,6 @@ struct st_VioSSLConnectorFd *new_VioSSLConnectorFd(
struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd(
const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path);
Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state);
-//static int
-//init_bio_(struct st_VioSSLAcceptorFd* fd, Vio* sd, int state, int bio_flags);
-//void report_errors();
#ifdef __cplusplus
}
diff --git a/vio/vio.c b/vio/vio.c
index 689a01f4475..e55949915c0 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -66,13 +66,17 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
my_socket sd, HANDLE hPipe,
my_bool localhost)
{
+ DBUG_ENTER("vio_reset");
+ DBUG_PRINT("enter", ("type=%d sd=%d localhost=%d", type, sd, localhost));
bzero((char*) vio, sizeof(Vio));
vio->type = type;
vio->sd = sd;
vio->hPipe = hPipe;
vio->localhost= localhost;
#ifdef HAVE_VIO
-if(type == VIO_TYPE_SSL){
+if(0) {
+#ifdef HAVE_OPENSSL
+} else if(type == VIO_TYPE_SSL){
vio->viodelete =vio_ssl_delete;
vio->vioerrno =vio_ssl_errno;
vio->read =vio_ssl_read;
@@ -84,6 +88,9 @@ if(type == VIO_TYPE_SSL){
vio->peer_addr =vio_ssl_peer_addr;
vio->in_addr =vio_ssl_in_addr;
vio->poll_read =vio_ssl_poll_read;
+ vio->vioblocking=vio_blocking;
+ vio->is_blocking=vio_is_blocking;
+#endif /* HAVE_OPENSSL */
} else { /* default is VIO_TYPE_TCPIP */
vio->viodelete =vio_delete;
vio->vioerrno =vio_errno;
@@ -96,9 +103,12 @@ if(type == VIO_TYPE_SSL){
vio->peer_addr =vio_peer_addr;
vio->in_addr =vio_in_addr;
vio->poll_read =vio_poll_read;
+ vio->vioblocking=vio_blocking;
+ vio->is_blocking=vio_is_blocking;
}
#endif /* HAVE_VIO */
+ DBUG_VOID_RETURN;
}
/* Open the socket or TCP/IP connection and read the fnctl() status */
--
2.30.9