aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2010-03-13 16:56:37 +0000
committerBruce Momjian <bruce@momjian.us>2010-03-13 16:56:37 +0000
commit54aaef864213d7b91f1efc691d3dc93ba468815b (patch)
tree6db58715ce520e2c35ef8927c3c96aea034a96fc /src
parent3f10d21ecddd8af06bfc6d458f5c9fa092730bc0 (diff)
downloadpostgresql-54aaef864213d7b91f1efc691d3dc93ba468815b.tar.gz
postgresql-54aaef864213d7b91f1efc691d3dc93ba468815b.zip
Revert all keepalive moves, reevaluate.
Diffstat (limited to 'src')
-rw-r--r--src/backend/libpq/pqcomm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index a5c3af3f1db..38c24267610 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.207 2010/03/13 16:40:38 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.208 2010/03/13 16:56:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1346,10 +1346,10 @@ pq_getkeepalivesidle(Port *port)
int
pq_setkeepalivesidle(int idle, Port *port)
{
-#ifdef TCP_KEEPIDLE
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK;
+#ifdef TCP_KEEPIDLE
if (idle == port->keepalives_idle)
return STATUS_OK;
@@ -1418,10 +1418,10 @@ pq_getkeepalivesinterval(Port *port)
int
pq_setkeepalivesinterval(int interval, Port *port)
{
-#ifdef TCP_KEEPINTVL
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK;
+#ifdef TCP_KEEPINTVL
if (interval == port->keepalives_interval)
return STATUS_OK;
@@ -1490,10 +1490,10 @@ pq_getkeepalivescount(Port *port)
int
pq_setkeepalivescount(int count, Port *port)
{
-#ifdef TCP_KEEPCNT
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK;
+#ifdef TCP_KEEPCNT
if (count == port->keepalives_count)
return STATUS_OK;