mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert all keepalive moves, reevaluate.

Browse Source
This commit is contained in:
Bruce Momjian 2010-03-13 16:56:37 +00:00
parent 3f10d21ecd
commit 54aaef8642
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/libpq/pqcomm.c
View File

@ -30,7 +30,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 int
pq_setkeepalivesidle(int idle, Port *port) pq_setkeepalivesidle(int idle, Port *port)
{ {
#ifdef TCP_KEEPIDLE
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family)) if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK; return STATUS_OK;
#ifdef TCP_KEEPIDLE
if (idle == port->keepalives_idle) if (idle == port->keepalives_idle)
return STATUS_OK; return STATUS_OK;
@ -1418,10 +1418,10 @@ pq_getkeepalivesinterval(Port *port)
int int
pq_setkeepalivesinterval(int interval, Port *port) pq_setkeepalivesinterval(int interval, Port *port)
{ {
#ifdef TCP_KEEPINTVL
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family)) if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK; return STATUS_OK;
#ifdef TCP_KEEPINTVL
if (interval == port->keepalives_interval) if (interval == port->keepalives_interval)
return STATUS_OK; return STATUS_OK;
@ -1490,10 +1490,10 @@ pq_getkeepalivescount(Port *port)
int int
pq_setkeepalivescount(int count, Port *port) pq_setkeepalivescount(int count, Port *port)
{ {
#ifdef TCP_KEEPCNT
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family)) if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK; return STATUS_OK;
#ifdef TCP_KEEPCNT
if (count == port->keepalives_count) if (count == port->keepalives_count)
return STATUS_OK; return STATUS_OK;