Merged Jeff's fix for Bug 667384

This commit was needed to reorder the commit history so that everyone
else's commits since 2010-09-27 remain on the mainline.

configure/os/CONFIG.cygwin-x86.cygwin-x86-debug

@@ -7,8 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.Common.cygwin-x86
-include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86
+-include $(CONFIG)/os/CONFIG.Common.cygwin-x86
+-include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86
+-include $(CONFIG)/os/CONFIG_SITE.Common.cygwin-x86
+-include $(CONFIG)/os/CONFIG_SITE.cygwin-x86.cygwin-x86
 
 BUILD_CLASS = HOST
 

src/rsrv/camessage.c

@@ -1566,6 +1566,7 @@ static void putNotifyErrorReply ( struct client *client, caHdrLargeArray *mp, in
         0u, mp->m_dataType, mp->m_count, statusCA, 
         mp->m_available, 0 );
     if ( status != ECA_NORMAL ) {
+        SEND_UNLOCK ( client );
         errlogPrintf ("%s at %d: should always get sufficent space for put notify error reply\n",
             __FILE__, __LINE__);
         return;
@@ -2144,6 +2145,7 @@ static void search_fail_reply ( caHdrLargeArray *mp, void *pPayload, struct clie
     status = cas_copy_in_header ( client, CA_PROTO_NOT_FOUND, 
         0u, mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, NULL );
     if ( status != ECA_NORMAL ) {
+        SEND_UNLOCK ( client );
         errlogPrintf ( "%s at %d: should always get sufficent space for search fail reply?\n",
             __FILE__, __LINE__ );
         return;

src/rsrv/caservertask.c

@@ -416,8 +416,8 @@ static void log_one_client (struct client *client, unsigned level)
             send_delay, recv_delay);
         printf( 
         "\tUnprocessed request bytes=%u, Undelivered response bytes=%u\n", 
-            client->send.stk,
-            client->recv.cnt - client->recv.stk ); 
+            client->recv.cnt - client->recv.stk,
+            client->send.stk ); 
         printf( 
         "\tState=%s%s%s\n", 
             state[client->disconnect?1:0],