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

Add a check for end of client connection before expecting a password

Browse Source 
response, to avoid noise in the server log.
This commit is contained in:
Peter Eisentraut 2001-08-07 10:44:16 +00:00
parent 2f4759d5ce
commit 50036e85b3
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.55 2001/08/01 23:25:39 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.56 2001/08/07 10:44:13 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -554,7 +554,7 @@ recv_and_check_password_packet(Port *port)
int32 len; int32 len;
int result; int result;
if (pq_getint(&len, 4) == EOF) if (pq_eof() == EOF || pq_getint(&len, 4) == EOF)
return STATUS_ERROR; /* client didn't want to send password */ return STATUS_ERROR; /* client didn't want to send password */
initStringInfo(&buf); initStringInfo(&buf);
pq_getstr(&buf); pq_getstr(&buf);

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

@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqcomm.c,v 1.119 2001/08/05 01:22:16 tgl Exp $ * $Id: pqcomm.c,v 1.120 2001/08/07 10:44:15 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -695,6 +695,26 @@ pq_flush(void)
} }
/*
* Return EOF if the connection has been broken, else 0.
*/
int
pq_eof(void)
{
char x;
int res;
res = recv(MyProcPort->sock, &x, 1, MSG_PEEK);
if (res == -1)
fprintf(stderr, "pq_eof: recv() failed: %s\n", strerror(errno));
else if (res == 0)
return EOF;
else
return 0;
}
/* -------------------------------- /* --------------------------------
* Message-level I/O routines begin here. * Message-level I/O routines begin here.
* *

3
src/include/libpq/libpq.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq.h,v 1.44 2001/03/22 04:00:48 momjian Exp $ * $Id: libpq.h,v 1.45 2001/08/07 10:44:16 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -65,6 +65,7 @@ extern int pq_getstring(StringInfo s);
extern int pq_peekbyte(void); extern int pq_peekbyte(void);
extern int pq_putbytes(const char *s, size_t len); extern int pq_putbytes(const char *s, size_t len);
extern int pq_flush(void); extern int pq_flush(void);
extern int pq_eof(void);
extern int pq_putmessage(char msgtype, const char *s, size_t len); extern int pq_putmessage(char msgtype, const char *s, size_t len);
extern void pq_startcopyout(void); extern void pq_startcopyout(void);
extern void pq_endcopyout(bool errorAbort); extern void pq_endcopyout(bool errorAbort);