diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:07 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:07 +0000 |
| commit | e461436f876b10d5053d152aada43e29ba6fd852 (patch) | |
| tree | 1e99bd165bb4f66939b3ad42016e369916e16a1d /src/backend/postmaster/postmaster.c | |
| parent | b382cbb0448e32a806e03976204f767a54ce36b5 (diff) | |
| download | postgresql-e461436f876b10d5053d152aada43e29ba6fd852.tar.gz postgresql-e461436f876b10d5053d152aada43e29ba6fd852.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.
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -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 ab9fb8725aa..30635006060 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.583.2.6 2009/08/24 20:08:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.583.2.7 2009/12/02 17:41:07 tgl Exp $ * * NOTES * @@ -1660,6 +1660,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 */ |