[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient PgDbClient.cs,1.36,1.37

[<car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient
In directory sc8-pr-cvs1:/tmp/cvs-serv29543

Modified Files:
	PgDbClient.cs 
Log Message:
2003-11-22 Carlos Guzmán Álvarez  <car...@te...>

	* source/NPgClient/PgDbClient.cs:

		- Added correct processing of SSLRequest message.

Index: PgDbClient.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgDbClient.cs,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** PgDbClient.cs	21 Nov 2003 23:15:58 -0000	1.36
--- PgDbClient.cs	22 Nov 2003 14:42:08 -0000	1.37
***************
*** 251,255 ****
  		#region RESPONSE_METHODS
  
! 		public PgResponsePacket ReceiveResponsePacket(params bool[] sslRequest)
  		{
  			PgResponsePacket responsePacket = null;
--- 251,255 ----
  		#region RESPONSE_METHODS
  
! 		public PgResponsePacket ReceiveResponsePacket()
  		{
  			PgResponsePacket responsePacket = null;
***************
*** 257,267 ****
  			lock (this)
  			{
! 				bool isSslRequest = false;
! 				if (sslRequest.Length != 0)
! 				{
! 					isSslRequest = sslRequest[0];
! 				}
! 
! 				responsePacket = this.receiveStandardPacket(isSslRequest);
  
  				switch (responsePacket.Message)
--- 257,261 ----
  			lock (this)
  			{
! 				responsePacket = this.receiveStandardPacket();
  
  				switch (responsePacket.Message)
***************
*** 285,289 ****
  						this.InfoMessage(this, new PgClientMessageEventArgs(ex));
  					}
! 					break;
  
  					case PgBackendCodes.NOTIFICATION_RESPONSE:
--- 279,283 ----
  						this.InfoMessage(this, new PgClientMessageEventArgs(ex));
  					}
! 						break;
  
  					case PgBackendCodes.NOTIFICATION_RESPONSE:
***************
*** 291,298 ****
  						processNotificationResponse(responsePacket);
  					}
! 					break;
  
  					default:
! 						break;						
  				}
  			}
--- 285,292 ----
  						processNotificationResponse(responsePacket);
  					}
! 						break;
  
  					default:
! 						break;
  				}
  			}
***************
*** 301,329 ****
  		}
  
! 		private PgResponsePacket receiveStandardPacket(bool isSslRequest)
  		{
  			PgResponsePacket responsePacket = null;
  
- 			int		length	= 0;
  			char	type	= this.receive.ReadChar();			
! 			if (!isSslRequest)
! 			{
! 				length = IPAddress.HostToNetworkOrder(this.receive.ReadInt32()) - 4;
! 			}
! 			if (isSslRequest || length == 0)
! 			{
! 				responsePacket = new PgResponsePacket(type, new byte[0]{});
! 			}
! 			else
  			{
! 				// Read the message data
! 				byte[]	buffer		= new byte[length];
! 				int		received	= 0;
! 				while (received < length)
! 				{
! 					received += this.receive.Read(buffer, received, length - received);
! 				}
! 				responsePacket	= new PgResponsePacket(type, buffer);				
  			}
  			responsePacket.Encoding = Settings.Encoding;
  
--- 295,313 ----
  		}
  
! 		private PgResponsePacket receiveStandardPacket()
  		{
  			PgResponsePacket responsePacket = null;
  
  			char	type	= this.receive.ReadChar();			
! 			int		length	= IPAddress.HostToNetworkOrder(this.receive.ReadInt32()) - 4;
! 
! 			// Read the message data
! 			byte[]	buffer		= new byte[length];
! 			int		received	= 0;
! 			while (received < length)
  			{
! 				received += this.receive.Read(buffer, received, length - received);
  			}
+ 			responsePacket			= new PgResponsePacket(type, buffer);				
  			responsePacket.Encoding = Settings.Encoding;
  
***************
*** 652,658 ****
  
  					// Receive server response
! 					PgResponsePacket response = ReceiveResponsePacket(true);
  
! 					switch (response.Message)
  					{
  						case 'S':
--- 636,642 ----
  
  					// Receive server response
! 					char sslSupport = Convert.ToChar(this.networkStream.ReadByte());
  
! 					switch (sslSupport)
  					{
  						case 'S':