mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Kerberos fixes from Magnus Hagander --- in theory Kerberos 5 auth
should work on Windows now. Also, rename set_noblock to pg_set_noblock; since it is included in libpq, the former name polluted application namespace.
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
*
|
||||
* Copyright (c) 2001-2005, PostgreSQL Global Development Group
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.87 2005/01/01 05:43:07 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.88 2005/03/25 00:34:21 tgl Exp $
|
||||
* ----------
|
||||
*/
|
||||
#include "postgres.h"
|
||||
@@ -422,7 +422,7 @@ pgstat_init(void)
|
||||
* messages will be discarded; backends won't block waiting to send
|
||||
* messages to the collector.
|
||||
*/
|
||||
if (!set_noblock(pgStatSock))
|
||||
if (!pg_set_noblock(pgStatSock))
|
||||
{
|
||||
ereport(LOG,
|
||||
(errcode_for_socket_access(),
|
||||
@@ -1766,7 +1766,7 @@ pgstat_recvbuffer(void)
|
||||
* Set the write pipe to nonblock mode, so that we cannot block when
|
||||
* the collector falls behind.
|
||||
*/
|
||||
if (!set_noblock(writePipe))
|
||||
if (!pg_set_noblock(writePipe))
|
||||
ereport(ERROR,
|
||||
(errcode_for_socket_access(),
|
||||
errmsg("could not set statistics collector pipe to nonblocking mode: %m")));
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.449 2005/03/24 18:16:17 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.450 2005/03/25 00:34:21 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
*
|
||||
@@ -1246,10 +1246,10 @@ ServerLoop(void)
|
||||
PgStatPID = pgstat_start();
|
||||
|
||||
/*
|
||||
* Touch the socket and lock file at least every hour, to
|
||||
* Touch the socket and lock file every 58 minutes, to
|
||||
* ensure that they are not removed by overzealous /tmp-cleaning
|
||||
* tasks. Set to 58 minutes so a cleaner never sees the
|
||||
* file as an hour old.
|
||||
* tasks. We assume no one runs cleaners with cutoff times of
|
||||
* less than an hour ...
|
||||
*/
|
||||
now = time(NULL);
|
||||
if (now - last_touch_time >= 58 * 60)
|
||||
@@ -2479,7 +2479,7 @@ report_fork_failure_to_client(Port *port, int errnum)
|
||||
strerror(errnum));
|
||||
|
||||
/* Set port to non-blocking. Don't do send() if this fails */
|
||||
if (!set_noblock(port->sock))
|
||||
if (!pg_set_noblock(port->sock))
|
||||
return;
|
||||
|
||||
send(port->sock, buffer, strlen(buffer) + 1, 0);
|
||||
|
||||
Reference in New Issue
Block a user