postgres.git / summary / log / commit / refs
commit 8fa541943a2f1335111111d269fe30253cd78235
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed Dec 02 17:42:02 2009 +0000
First released in: 7.4.27, 8.0.23, 8.1.19, 8.2.15, 8.3.9, 8.4.2
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.
src/backend/postmaster/postmaster.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 */
[parent: b88ad6ef962e]