diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:46 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:41:46 +0000 |
| commit | 532ae854ccc5527906dccdcbaf7ca5d5c533d8f7 (patch) | |
| tree | 904dba022ac844171f049b49d3b318012b8776d3 | |
| parent | c63dbfff8379622de9def83827a6af610684467a (diff) | |
| download | postgresql-532ae854ccc5527906dccdcbaf7ca5d5c533d8f7.tar.gz postgresql-532ae854ccc5527906dccdcbaf7ca5d5c533d8f7.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 5a107a78f4b..f7ad189ce42 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.475.2.10 2008/06/27 01:53:08 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.475.2.11 2009/12/02 17:41:46 tgl Exp $ * * NOTES * @@ -1493,6 +1493,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 */ |