diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:42:02 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-12-02 17:42:02 +0000 |
| commit | 8fa541943a2f1335111111d269fe30253cd78235 (patch) | |
| tree | 7a7313bd026bfd42a4cc1f04287af9e9a3d75173 | |
| parent | b88ad6ef962e7990a19184dd6053c765e19939e4 (diff) | |
| download | postgresql-8fa541943a2f1335111111d269fe30253cd78235.tar.gz postgresql-8fa541943a2f1335111111d269fe30253cd78235.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 7efba17bf36..230593e646d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.347.2.3 2006/03/18 22:10:44 neilc Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.347.2.4 2009/12/02 17:42:02 tgl Exp $ * * NOTES * @@ -1332,6 +1332,8 @@ ProcessStartupPacket(Port *port, bool SSLdone) 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 */ |