postgres.git / summary / log / commit / refs

commit    2e7e4ab945109af9169cd3abb068f6b58a190d9e
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Dec 02 17:41:39 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 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 */


[parent: d4d4e95030f2]