From 97ac1543376e5a2479baefa97f2eeb1c35cd5d69 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Sat, 12 Feb 2011 15:52:36 +0100
Subject: [PATCH] Nu met extra puddingbroodjes!

---
 Connector_HTTP/main.cpp | 1 +
 util/http_parser.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp
index 1cfe5ab5..52904762 100644
--- a/Connector_HTTP/main.cpp
+++ b/Connector_HTTP/main.cpp
@@ -41,6 +41,7 @@ int mainHandler(int CONN_fd){
     retval = epoll_wait(poller, events, 1, 1);
     if ((retval > 0) || !ready4data){
       if (HTTP_R.ReadSocket(CONN_fd)){
+        printf("Puddingbroodjes!\n");
         //ERIK: we hebben nu een hele HTTP request geparsed - verwerken mag hier, door aanroepen naar
         //ERIK: bijvoorbeeld HTTP_R.GetHeader("headernaam") (voor headers) of HTTP_R.GetVar("varnaam") (voor GET/POST vars)
         //ERIK: of HTTP_R.method of HTTP_R.url of HTTP_R.protocol....
diff --git a/util/http_parser.cpp b/util/http_parser.cpp
index b6bf2beb..f00cb2dd 100644
--- a/util/http_parser.cpp
+++ b/util/http_parser.cpp
@@ -136,6 +136,7 @@ bool HTTPReader::parse(){
       if (f == std::string::npos) return false;
       tmpA = HTTPbuffer.substr(0, f);
       HTTPbuffer.erase(0, f+1);
+      while (tmpA.find('\r') != std::string::npos){tmpA.erase(tmpA.find('\r'));}
       if (!seenReq){
         seenReq = true;
         f = tmpA.find(' ');
@@ -146,7 +147,7 @@ bool HTTPReader::parse(){
         if (f != std::string::npos){protocol = tmpA.substr(0, f); tmpA.erase(0, f+1);}
         //TODO: GET variable parsing
       }else{
-        if (tmpA[0] == '\n'){
+        if (tmpA.size() == 0){
           seenHeaders = true;
           if (GetHeader("Content-Length") != ""){length = atoi(GetHeader("Content-Length").c_str());}
         }else{