*** postgresql-7.0.3/src/interfaces/libpq/fe-connect.c~	Mon May 22 06:19:53 2000
--- postgresql-7.0.3/src/interfaces/libpq/fe-connect.c	Fri Nov 17 10:37:23 2000
***************
*** 1505,1514 ****
  			{
  				const char *env;
  
- 				/* query server encoding */
  				env = getenv(envname);
  				if (!env || *env == '\0')
  				{
  					if (!PQsendQuery(conn,
  									 "select getdatabaseencoding()"))
  						goto error_return;
--- 1505,1515 ----
  			{
  				const char *env;
  
  				env = getenv(envname);
  				if (!env || *env == '\0')
  				{
+ 					/* query server encoding if PGCLIENTENCODING
+ 					   is not specified */
  					if (!PQsendQuery(conn,
  									 "select getdatabaseencoding()"))
  						goto error_return;
***************
*** 1516,1521 ****
--- 1517,1535 ----
  					conn->setenv_state = SETENV_STATE_ENCODINGS_WAIT;
  					return PGRES_POLLING_READING;
  				}
+ 				else
+ 				{
+ 					/* otherwise set client encoding in pg_conn struct */
+ 					int encoding = pg_char_to_encoding(env);
+ 					if (encoding < 0)
+ 					{
+ 						strcpy(conn->errorMessage.data,
+ 							   "PGCLIENTENCODING has no valid encoding name.\n");
+ 						goto error_return;
+ 					}
+ 					conn->client_encoding = encoding;
+ 				}
+ 					
  			}
  
  		case SETENV_STATE_ENCODINGS_WAIT: