Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit69fed5b

Browse files
committed
Ensure libpq reports a suitable error message on unexpected socket EOF.
The EOF-detection logic in pqReadData was a bit confused about who shouldset up the error message in case the kernel gives us read-ready-but-no-datarather than ECONNRESET or some other explicit error condition. Since thewhole point of this situation is that the lower-level functions don't knowthere's anything wrong, pqReadData itself must set up the message. Butkeep the assumption that if an errno was reported, a message was set up atlower levels.Per bug #11712 from Marko Tiikkaja. It's been like this for a very longtime, so back-patch to all supported branches.
1 parent2ae7811 commit69fed5b

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

‎src/interfaces/libpq/fe-misc.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -764,12 +764,8 @@ pqReadData(PGconn *conn)
764764
/* ready for read */
765765
break;
766766
default:
767-
printfPQExpBuffer(&conn->errorMessage,
768-
libpq_gettext(
769-
"server closed the connection unexpectedly\n"
770-
"\tThis probably means the server terminated abnormally\n"
771-
"\tbefore or while processing the request.\n"));
772-
gotodefinitelyFailed;
767+
/* we override pqReadReady's message with something more useful */
768+
gotodefinitelyEOF;
773769
}
774770

775771
/*
@@ -808,9 +804,16 @@ pqReadData(PGconn *conn)
808804

809805
/*
810806
* OK, we are getting a zero read even though select() says ready. This
811-
* means the connection has been closed. Cope. Note that errorMessage
812-
* has been set already.
807+
* means the connection has been closed. Cope.
813808
*/
809+
definitelyEOF:
810+
printfPQExpBuffer(&conn->errorMessage,
811+
libpq_gettext(
812+
"server closed the connection unexpectedly\n"
813+
"\tThis probably means the server terminated abnormally\n"
814+
"\tbefore or while processing the request.\n"));
815+
816+
/* Come here if lower-level code already set a suitable errorMessage */
814817
definitelyFailed:
815818
pqDropConnection(conn);
816819
conn->status=CONNECTION_BAD;/* No more connection to backend */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp