From efb0b27f5bc659a49e330fb7970a9b1b6ae0f398 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 23 Sep 2008 08:10:37 +0000
Subject: Made fix for the 'multiple xml buffers in single network buffer'
 problem.

---
 server/src/server.cc | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'server/src/server.cc')

diff --git a/server/src/server.cc b/server/src/server.cc
index ad7065e..688a310 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -262,21 +262,33 @@ static void handleConnection(TCPSocket *socket)
   
   while((size = socket->read(buf, bufsize)) > 0) {
     
-    if(transaction == NULL) {
-      transaction = new Transaction();
-      parser = new TransactionParser(transaction);
-    }
+    while(size) {
+
+      if(transaction == NULL) {
+        transaction = new Transaction();
+        parser = new TransactionParser(transaction);
+      }
 
-    printf("Got %d bytes in read loop\n", size);
-    if(parser->parse(buf)) {
-      printf("Got complete XML document\n");
-      socket->write(handleTransaction(*transaction));
+      printf("Got %d bytes in read loop\n", size);
+      size = 0;
+      if(parser->parse(buf)) {
+        printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+               "!! Got complete XML document %d bytes used, %d bytes in current buffer.\n"
+               "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", parser->usedBytes(), strlen(buf));
 
-      delete transaction;
-      transaction = NULL;
+        if(parser->usedBytes() < strlen(buf)) {
+          size = strlen(buf) - parser->usedBytes();
+          strcpy(buf, buf + parser->usedBytes());
+        }
 
-      delete parser;
-      parser = NULL;
+        socket->write(handleTransaction(*transaction));
+        
+        delete transaction;
+        transaction = NULL;
+        
+        delete parser;
+        parser = NULL;
+      }
     }
     memset(buf, 0, bufsize);
   }
-- 
cgit v1.2.3