[Firebird-checkins] SF.net SVN: firebird:[53787] firebird/trunk/src/remote

[<di...@us...>]

Revision: 53787
          http://firebird.svn.sourceforge.net/firebird/?rev=53787&view=rev
Author:   dimitr
Date:     2011-12-28 18:16:11 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/src/remote/client/interface.cpp
    firebird/trunk/src/remote/inet.cpp

Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2011-12-28 18:12:23 UTC (rev 53786)
+++ firebird/trunk/src/remote/client/interface.cpp	2011-12-28 18:16:11 UTC (rev 53787)
@@ -2114,7 +2114,7 @@
 			sqldata->p_sqldata_message_number = 0;	// msg_type
 			if (sqldata->p_sqldata_messages = statement->rsr_select_format ? 1 : 0)
 			{
-				if (!(port->port_flags &PORT_rpc))
+				if (!(port->port_flags & PORT_rpc))
 				{
 					sqldata->p_sqldata_messages =
 						static_cast<USHORT>(REMOTE_compute_batch_size(port,

Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp	2011-12-28 18:12:23 UTC (rev 53786)
+++ firebird/trunk/src/remote/inet.cpp	2011-12-28 18:16:11 UTC (rev 53787)
@@ -120,9 +120,7 @@
 
 using namespace Firebird;
 
-const USHORT MAX_PTYPE	= ptype_lazy_send;
 
-
 #ifdef WIN_NT
 
 #include <fcntl.h>
@@ -599,11 +597,11 @@
 
 	static const p_cnct::p_cnct_repeat protocols_to_try1[] =
 	{
-		REMOTE_PROTOCOL(PROTOCOL_VERSION8, ptype_rpc, MAX_PTYPE, 1),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION10, ptype_rpc, MAX_PTYPE, 2),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, MAX_PTYPE, 3),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION12, ptype_rpc, MAX_PTYPE, 4),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION13, ptype_rpc, MAX_PTYPE, 5)
+		REMOTE_PROTOCOL(PROTOCOL_VERSION8, ptype_rpc, ptype_lazy_send, 1),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION10, ptype_rpc, ptype_lazy_send, 2),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, ptype_lazy_send, 3),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION12, ptype_rpc, ptype_lazy_send, 4),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION13, ptype_rpc, ptype_lazy_send, 5)
 	};
 
 	cnct->p_cnct_count = FB_NELEM(protocols_to_try1);
@@ -626,7 +624,7 @@
 		static const p_cnct::p_cnct_repeat protocols_to_try2[] =
 		{
 			REMOTE_PROTOCOL(PROTOCOL_VERSION6, ptype_rpc, ptype_batch_send, 1),
-			REMOTE_PROTOCOL(PROTOCOL_VERSION7, ptype_rpc, MAX_PTYPE, 2)
+			REMOTE_PROTOCOL(PROTOCOL_VERSION7, ptype_rpc, ptype_lazy_send, 2)
 		};
 
 		cnct->p_cnct_count = FB_NELEM(protocols_to_try2);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.