diff --git a/lib/nanoserve.rb b/lib/nanoserve.rb
index 57bb2ba..5410521 100644
--- a/lib/nanoserve.rb
+++ b/lib/nanoserve.rb
@@ -65,9 +65,9 @@ module NanoServe
         buf = +''
         loop do
           line = conn.readline
-          break if line.chomp == ''
           req << line
           buf << line if logger.debug?
+          break if req.headers?
         end
         logger.debug "request:\n" + buf.gsub(/^/, '    ')
 
@@ -104,6 +104,10 @@ module NanoServe
         end
       end
 
+      def headers?
+        @sep
+      end
+
       REQ_RE = %r{(?<method>[A-Z]+)\s+(?<path>\S+)\s+(?<version>HTTP/\d+.\d+)$}
 
       def parse_request(str)