version 0.3.0

[fms.git] / include / http / httpthread.h

diff --git a/include/http/httpthread.h b/include/http/httpthread.h
index 8ebd00d..b6d7035 100644 (file)
--- a/include/http/httpthread.h
+++ b/include/http/httpthread.h
@@ -1,29 +1,23 @@
 #ifndef _httpthread_\r
 #define _httpthread_\r
 \r
-#include "../pthreadwrapper/runnable.h"\r
+#include "../threadwrapper/cancelablerunnable.h"\r
 #include "../ilogger.h"\r
 #include "../idatabase.h"\r
-#include "ipagehandler.h"\r
-#include "httpdefs.h"\r
 \r
 #include <cstdlib>\r
-#include <shttpd.h>\r
 \r
-class HTTPThread:public PThread::Runnable,public ILogger, public IDatabase\r
+class HTTPThread:public CancelableRunnable,public ILogger, public IDatabase\r
 {\r
 public:\r
        HTTPThread();\r
-       ~HTTPThread();\r
        \r
-       void Run();\r
+       void run();\r
 \r
 private:\r
-       static void PageCallback(shttpd_arg *arg);\r
+       //static void PageCallback(shttpd_arg *arg);\r
 \r
-       struct shttpd_ctx *m_ctx;\r
-\r
-       std::vector<IPageHandler *> m_pagehandlers;\r
+       int m_listenport;\r
 \r
 };\r
 \r