diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:39 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:39 +0000 |
| commit | 2e7e4ab945109af9169cd3abb068f6b58a190d9e (patch) | |
| tree | d93b0f1f4898ea0d1904dbe6a5a7f48f646a6459 | |
| parent | d4d4e95030f2c808e1cc85404959145e37db42ba (diff) | |
| download | postgresql-2e7e4ab945109af9169cd3abb068f6b58a190d9e.tar.gz postgresql-2e7e4ab945109af9169cd3abb068f6b58a190d9e.zip | |
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 9d86462f89e..3883a451225 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.505.2.6 2008/06/27 01:53:20 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.505.2.7 2009/12/02 17:41:39 tgl Exp $ * * NOTES * @@ -1479,6 +1479,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 */ |