diff options
| author | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
| commit | e7d7c0f23630cd75d6912feb4196a84f82566a57 (patch) | |
| tree | 473d25909e3be433119f837f31e252c0c64fca28 /vio/vio_priv.h | |
| parent | 9f5a51e8d6344bd2540a36b7bd5efd501fa90745 (diff) | |
| download | mariadb-git-e7d7c0f23630cd75d6912feb4196a84f82566a57.tar.gz | |
Bug #9721 net_write_timeout not used on Windows
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
Diffstat (limited to 'vio/vio_priv.h')
| -rw-r--r-- | vio/vio_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/vio_priv.h b/vio/vio_priv.h index 9a925a2c4c9..3a75a08021d 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -23,7 +23,7 @@ #include <m_string.h> #include <violite.h> -void vio_ignore_timeout(Vio *vio, uint timeout); +void vio_ignore_timeout(Vio *vio, uint which, uint timeout); #ifdef HAVE_OPENSSL #include "my_net.h" /* needed because of struct in_addr */ @@ -31,7 +31,7 @@ void vio_ignore_timeout(Vio *vio, uint timeout); void vio_ssl_delete(Vio* vio); int vio_ssl_read(Vio *vio,gptr buf, int size); int vio_ssl_write(Vio *vio,const gptr buf,int size); -void vio_ssl_timeout(Vio *vio, uint timeout); +void vio_ssl_timeout(Vio *vio, uint which, uint timeout); /* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. */ int vio_ssl_fastsend(Vio *vio); |