summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2009-12-02 17:41:53 +0000
committerTom Lane2009-12-02 17:41:53 +0000
commit6bd8a543f75848b2eab06226edfc1479782dbdc9 (patch)
tree2eeefb831ee8aa873f101e946957e557885b4854
parenta81629696f97c7161e43c5ae889f487a739116e3 (diff)
Ignore attempts to set "application_name" in the connection startup packet.
This avoids a useless connection retry and complaint in the postmaster log when receiving a connection from 8.5 or later libpq. Backpatch in all supported branches, but of course *not* HEAD.
-rw-r--r--src/backend/postmaster/postmaster.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1d491b8b317..17a42445078 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.11 2008/06/27 01:52:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.12 2009/12/02 17:41:53 tgl Exp $
*
* NOTES
*
@@ -1484,6 +1484,8 @@ retry1:
port->user_name = pstrdup(valptr);
else if (strcmp(nameptr, "options") == 0)
port->cmdline_options = pstrdup(valptr);
+ else if (strcmp(nameptr, "application_name") == 0)
+ /* ignore for compatibility with libpq >= 8.5 */ ;
else
{
/* Assume it's a generic GUC option */