cleanup

GeneralServer/GeneralAsyncCommTask.h

@@ -32,8 +32,8 @@
 #include "GeneralServer/GeneralCommTask.h"
 
 #include <Basics/Exceptions.h>
-#include <Rest/AsyncTask.h>
 
+#include "Scheduler/AsyncTask.h"
 #include "GeneralServer/GeneralServerJob.h"
 
 namespace triagens {

GeneralServer/GeneralCommTask.h

@@ -31,11 +31,12 @@
 
 #include <Basics/Common.h>
 
-#include <Basics/Logger.h>
+#include <Logger/Logger.h>
 #include <Basics/StringBuffer.h>
-#include <Rest/SocketTask.h>
 #include <Rest/HttpRequest.h>
 
+#include "Scheduler/SocketTask.h"
+
 namespace triagens {
   namespace rest {
 
@@ -59,13 +60,16 @@ namespace triagens {
             SocketTask(fd),
             server(server),
             connectionInfo(info),
+            writeBuffers(),
             readPosition(0),
             bodyPosition(0),
             bodyLength(0),
             requestPending(false),
             closeRequested(false),
             request(0),
-            readRequestBody(false) {
+            readRequestBody(false),
+            maximalHeaderSize(0),
+            maximalBodySize(0) {
           LOGGER_TRACE << "connection established, client " << fd
                        << ", server ip " << connectionInfo.serverAddress
                        << ", server port " << connectionInfo.serverPort

GeneralServer/GeneralListenTask.h

@@ -29,9 +29,7 @@
 #ifndef TRIAGENS_FYN_GENERAL_SERVER_GENERAL_LISTEN_TASK_H
 #define TRIAGENS_FYN_GENERAL_SERVER_GENERAL_LISTEN_TASK_H 1
 
-#include <Basics/Common.h>
-
-#include <Rest/ListenTask.h>
+#include "Scheduler/ListenTask.h"
 
 namespace triagens {
   namespace rest {

GeneralServer/GeneralServer.h

@@ -32,15 +32,15 @@
 #include <Basics/Common.h>
 
 #include <Basics/Exceptions.h>
-#include <Basics/Logger.h>
+#include <Logger/Logger.h>
 #include <Basics/ReadLocker.h>
 #include <Basics/ReadWriteLock.h>
 #include <Basics/WriteLocker.h>
 #include <Rest/Handler.h>
-#include <Rest/ListenTask.h>
-#include <Rest/Scheduler.h>
-#include <Rest/SocketTask.h>
 
+#include "Scheduler/Scheduler.h"
+#include "Scheduler/SocketTask.h"
+#include "Scheduler/ListenTask.h"
 #include "GeneralServer/GeneralListenTask.h"
 #include "GeneralServer/SpecificCommTask.h"
 

GeneralServer/GeneralServerDispatcher.h

@@ -31,8 +31,7 @@
 
 #include "GeneralServer/GeneralServer.h"
 
-#include <Rest/Dispatcher.h>
-
+#include "Dispatcher/Dispatcher.h"
 #include "GeneralServer/GeneralCommTask.h"
 #include "GeneralServer/GeneralAsyncCommTask.h"
 

GeneralServer/GeneralServerJob.h

@@ -29,13 +29,14 @@
 #ifndef TRIAGENS_FYN_GENERAL_SERVER_GENERAL_SERVER_JOB_H
 #define TRIAGENS_FYN_GENERAL_SERVER_GENERAL_SERVER_JOB_H 1
 
-#include <Rest/Job.h>
+#include "Dispatcher/Job.h"
 
 #include <Basics/Exceptions.h>
 #include <Basics/StringUtils.h>
 #include <Basics/Mutex.h>
 #include <Rest/Handler.h>
-#include <Rest/AsyncTask.h>
+
+#include "Scheduler/AsyncTask.h"
 
 namespace triagens {
   namespace rest {