diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-26 20:06:52 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-26 20:06:52 +0000 |
| commit | 4355d214c248c959cfbcd974b5e9ba8a6bf81074 (patch) | |
| tree | 4e53e382434fa1e61199caf90a679c842c1cc49f /src/backend/libpq/be-secure.c | |
| parent | 8ff2bccee31a7be12f653bc533b3e76c052534f8 (diff) | |
| download | postgresql-4355d214c248c959cfbcd974b5e9ba8a6bf81074.tar.gz | |
On Windows, use pgwin32_waitforsinglesocket() instead of select() to wait for
input in the stats collector. Our select() emulation is apparently buggy
for UDP sockets :-(. This should resolve problems with stats collection
(and hence autovacuum) failing under more than minimal load. Diagnosis
and patch by Magnus Hagander.
Patch probably needs to be back-ported to 8.1 and 8.0, but first let's
see if it makes the buildfarm happy...
Diffstat (limited to 'src/backend/libpq/be-secure.c')
| -rw-r--r-- | src/backend/libpq/be-secure.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index 421c4b68ce..ac0196cead 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.75 2007/01/05 22:19:29 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.76 2007/01/26 20:06:52 tgl Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -275,7 +275,8 @@ rloop: #ifdef WIN32 pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl), (err == SSL_ERROR_WANT_READ) ? - FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE); + FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE, + INFINITE); #endif goto rloop; case SSL_ERROR_SYSCALL: @@ -374,7 +375,8 @@ wloop: #ifdef WIN32 pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl), (err == SSL_ERROR_WANT_READ) ? - FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE); + FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE, + INFINITE); #endif goto wloop; case SSL_ERROR_SYSCALL: @@ -889,7 +891,8 @@ aloop: #ifdef WIN32 pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl), (err == SSL_ERROR_WANT_READ) ? - FD_READ | FD_CLOSE | FD_ACCEPT : FD_WRITE | FD_CLOSE); + FD_READ | FD_CLOSE | FD_ACCEPT : FD_WRITE | FD_CLOSE, + INFINITE); #endif goto aloop; case SSL_ERROR_SYSCALL: |
