Revert "Cleanup HttpHeaderProcessor::parse"

This reverts commit 047b49b7a02f14c714360efd1f7fe20c33f5850d.

src/HttpHeaderProcessor.cc

@@ -133,305 +133,237 @@ bool HttpHeaderProcessor::parse(const unsigned char* data, size_t length)
 {
   size_t i;
   lastBytesProcessed_ = 0;
-  for (i = 0; i < length; ++i) {
+  for(i = 0; i < length; ++i) {
     unsigned char c = data[i];
-    switch (state_) {
+    switch(state_) {
     case PREV_METHOD:
-      if (util::isLws(c) || util::isCRLF(c)) {
+      if(util::isLws(c) || util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Request-Line: missing method");
+      } else {
+        i = getToken(buf_, data, length, i);
+        state_ = METHOD;
       }
-
-      i = getToken(buf_, data, length, i);
-      state_ = METHOD;
       break;
-
     case METHOD:
-      if (util::isLws(c)) {
+      if(util::isLws(c)) {
         result_->setMethod(buf_);
         buf_.clear();
         state_ = PREV_PATH;
-        break;
-      }
-
-      if (util::isCRLF(c)) {
+      } else if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Request-Line: missing request-target");
+      } else {
+        i = getToken(buf_, data, length, i);
       }
-
-      i = getToken(buf_, data, length, i);
       break;
-
     case PREV_PATH:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Request-Line: missing request-target");
+      } else if(!util::isLws(c)) {
+        i = getToken(buf_, data, length, i);
+        state_ = PATH;
       }
-
-      if (util::isLws(c)) {
-        break;
-      }
-
-      i = getToken(buf_, data, length, i);
-      state_ = PATH;
       break;
-
     case PATH:
-      if (util::isLws(c)) {
+      if(util::isLws(c)) {
         result_->setRequestPath(buf_);
         buf_.clear();
         state_ = PREV_REQ_VERSION;
-        break;
-      }
-
-      if (util::isCRLF(c)) {
+      } else if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Request-Line: missing HTTP-version");
+      } else {
+        i = getToken(buf_, data, length, i);
       }
-
-      i = getToken(buf_, data, length, i);
       break;
-
     case PREV_REQ_VERSION:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Request-Line: missing HTTP-version");
+      } else if(!util::isLws(c)) {
+        i = getToken(buf_, data, length, i);
+        state_ = REQ_VERSION;
       }
-
-      if (util::isLws(c)) {
-        break;
-      }
-
-      i = getToken(buf_, data, length, i);
-      state_ = REQ_VERSION;
       break;
-
     case REQ_VERSION:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         result_->setVersion(buf_);
         buf_.clear();
-        state_ = c == '\n' ? PREV_FIELD_NAME : PREV_EOL;
-        break;
-      }
-
-      if (util::isLws(c)) {
+        if(c == '\n') {
+          state_ = PREV_FIELD_NAME;
+        } else {
+          state_ = PREV_EOL;
+        }
+      } else if(util::isLws(c)) {
         throw DL_ABORT_EX("Bad Request-Line: LWS after HTTP-version");
+      } else {
+        i = getToken(buf_, data, length, i);
       }
-
-      i = getToken(buf_, data, length, i);
       break;
-
     case PREV_RES_VERSION:
-      if (util::isLws(c) || util::isCRLF(c)) {
+      if(util::isLws(c) || util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Status-Line: missing HTTP-version");
+      } else {
+        i = getToken(buf_, data, length, i);
+        state_ = RES_VERSION;
       }
-
-      i = getToken(buf_, data, length, i);
-      state_ = RES_VERSION;
       break;
-
     case RES_VERSION:
-      if (util::isLws(c)) {
+      if(util::isLws(c)) {
         result_->setVersion(buf_);
         buf_.clear();
         state_ = PREV_STATUS_CODE;
-        break;
-      }
-
-      if (util::isCRLF(c)) {
+      } else if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Status-Line: missing status-code");
       }
-
       break;
-
     case PREV_STATUS_CODE:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad Status-Line: missing status-code");
-      }
-
-      if (!util::isLws(c)) {
+      } else if(!util::isLws(c)) {
         state_ = STATUS_CODE;
         i = getToken(buf_, data, length, i);
       }
-
       break;
-
     case STATUS_CODE:
-      if (!util::isLws(c) && !util::isCRLF(c)) {
-        i = getToken(buf_, data, length, i);
-        break;
-      }
-
-      {
+      if(util::isLws(c) || util::isCRLF(c)) {
         int statusCode = -1;
         if(buf_.size() == 3 && util::isNumber(buf_.begin(), buf_.end())) {
           statusCode = (buf_[0]-'0')*100 + (buf_[1]-'0')*10 + (buf_[2]-'0');
         }
-        if (statusCode < 100) {
+        if(statusCode >= 100) {
+          result_->setStatusCode(statusCode);
+          buf_.clear();
+        } else {
           throw DL_ABORT_EX("Bad status code: bad status-code");
         }
-        result_->setStatusCode(statusCode);
-        buf_.clear();
-      }
-      if (c == '\r') {
-        state_ = PREV_EOL;
-        break;
-      }
-
-      if (c == '\n') {
-        state_ = PREV_FIELD_NAME;
-        break;
+        if(c == '\r') {
+          state_ = PREV_EOL;
+        } else if(c == '\n') {
+          state_ = PREV_FIELD_NAME;
+        } else {
+          state_ = PREV_REASON_PHRASE;
+        }
+      } else {
+        i = getToken(buf_, data, length, i);
       }
-
-      state_ = PREV_REASON_PHRASE;
       break;
-
     case PREV_REASON_PHRASE:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         // The reason-phrase is completely optional.
-        state_ = c == '\n' ? PREV_FIELD_NAME : PREV_EOL;
-        break;
-      }
-
-      if (util::isLws(c)) {
-        break;
+        if(c == '\n') {
+          state_ = PREV_FIELD_NAME;
+        } else {
+          state_ = PREV_EOL;
+        }
+      } else if(!util::isLws(c)) {
+        state_ = REASON_PHRASE;
+        i = getText(buf_, data, length, i);
       }
-
-      state_ = REASON_PHRASE;
-      i = getText(buf_, data, length, i);
       break;
-
     case REASON_PHRASE:
-      if (util::isCRLF(c)) {
+      if(util::isCRLF(c)) {
         result_->setReasonPhrase(buf_);
         buf_.clear();
-        state_ = c == '\n' ? PREV_FIELD_NAME : PREV_EOL;
-        break;
+        if(c == '\n') {
+          state_ = PREV_FIELD_NAME;
+        } else {
+          state_ = PREV_EOL;
+        }
+      } else {
+        i = getText(buf_, data, length, i);
       }
-
-      i = getText(buf_, data, length, i);
       break;
-
     case PREV_EOL:
-      if (c != '\n') {
+      if(c == '\n') {
+        state_ = PREV_FIELD_NAME;
+      } else {
         throw DL_ABORT_EX("Bad HTTP header: missing LF");
       }
-
-      state_ = PREV_FIELD_NAME;
       break;
-
     case PREV_FIELD_NAME:
-      if (util::isLws(c)) {
-        if( lastFieldName_.empty()) {
+      if(util::isLws(c)) {
+        if(lastFieldName_.empty()) {
           throw DL_ABORT_EX("Bad HTTP header: field name starts with LWS");
         }
         // Evil Multi-line header field
         state_ = FIELD_VALUE;
-        break;
-      }
-
-      if (!lastFieldName_.empty()) {
-        if(lastFieldHdKey_ != HttpHeader::MAX_INTERESTING_HEADER) {
-          result_->put(lastFieldHdKey_, util::strip(buf_));
+      } else {
+        if(!lastFieldName_.empty()) {
+          if(lastFieldHdKey_ != HttpHeader::MAX_INTERESTING_HEADER) {
+            result_->put(lastFieldHdKey_, util::strip(buf_));
+          }
+          lastFieldName_.clear();
+          lastFieldHdKey_ = HttpHeader::MAX_INTERESTING_HEADER;
+          buf_.clear();
+        }
+        if(c == '\n') {
+          state_ = HEADERS_COMPLETE;
+        } else if(c == '\r') {
+          state_ = PREV_EOH;
+        } else if(c == ':') {
+          throw DL_ABORT_EX("Bad HTTP header: field name starts with ':'");
+        } else {
+          state_ = FIELD_NAME;
+          i = getFieldNameToken(lastFieldName_, data, length, i);
         }
-        lastFieldName_.clear();
-        lastFieldHdKey_ = HttpHeader::MAX_INTERESTING_HEADER;
-        buf_.clear();
-      }
-      if (c == '\n') {
-        state_ = HEADERS_COMPLETE;
-        break;
-      }
-
-      if (c == '\r') {
-        state_ = PREV_EOH;
-        break;
-      }
-
-      if (c == ':') {
-        throw DL_ABORT_EX("Bad HTTP header: field name starts with ':'");
       }
-
-      state_ = FIELD_NAME;
-      i = getFieldNameToken(lastFieldName_, data, length, i);
       break;
-
     case FIELD_NAME:
-      if (util::isLws(c) || util::isCRLF(c)) {
+      if(util::isLws(c) || util::isCRLF(c)) {
         throw DL_ABORT_EX("Bad HTTP header: missing ':'");
-      }
-
-      if (c == ':') {
+      } else if(c == ':') {
         util::lowercase(lastFieldName_);
         lastFieldHdKey_ = idInterestingHeader(lastFieldName_.c_str());
         state_ = PREV_FIELD_VALUE;
-        break;
+      } else {
+        i = getFieldNameToken(lastFieldName_, data, length, i);
       }
-
-      i = getFieldNameToken(lastFieldName_, data, length, i);
       break;
-
     case PREV_FIELD_VALUE:
-      if (c == '\r') {
+      if(c == '\r') {
         state_ = PREV_EOL;
-        break;
-      }
-
-      if (c == '\n') {
+      } else if(c == '\n') {
         state_ = PREV_FIELD_NAME;
-        break;
-      }
-
-      if (util::isLws(c)) {
-        break;
-      }
-
-      state_ = FIELD_VALUE;
-      if (lastFieldHdKey_ == HttpHeader::MAX_INTERESTING_HEADER) {
-        i = ignoreText(buf_, data, length, i);
-        break;
+      } else if(!util::isLws(c)) {
+        state_ = FIELD_VALUE;
+        if(lastFieldHdKey_ == HttpHeader::MAX_INTERESTING_HEADER) {
+          i = ignoreText(buf_, data, length, i);
+        } else {
+          i = getText(buf_, data, length, i);
+        }
       }
-
-      i = getText(buf_, data, length, i);
       break;
-
     case FIELD_VALUE:
-      if (c == '\r') {
+      if(c == '\r') {
         state_ = PREV_EOL;
-        break;
-      }
-
-      if (c == '\n') {
+      } else if(c == '\n') {
         state_ = PREV_FIELD_NAME;
-        break;
-      }
-
-      if (lastFieldHdKey_ == HttpHeader::MAX_INTERESTING_HEADER) {
-        i = ignoreText(buf_, data, length, i);
-        break;
+      } else {
+        if(lastFieldHdKey_ == HttpHeader::MAX_INTERESTING_HEADER) {
+          i = ignoreText(buf_, data, length, i);
+        } else {
+          i = getText(buf_, data, length, i);
+        }
       }
-
-      i = getText(buf_, data, length, i);
       break;
-
     case PREV_EOH:
-      if (c != '\n') {
+      if(c == '\n') {
+        state_ = HEADERS_COMPLETE;
+      } else {
         throw DL_ABORT_EX("Bad HTTP header: "
                           "missing LF at the end of the header");
       }
-
-      state_ = HEADERS_COMPLETE;
       break;
-
     case HEADERS_COMPLETE:
       goto fin;
     }
   }
-
-fin:
+ fin:
   // See Apache's documentation
   // http://httpd.apache.org/docs/2.2/en/mod/core.html about size
   // limit of HTTP headers. The page states that the number of request
   // fields rarely exceeds 20.
-  if (lastFieldName_.size() > 1024 || buf_.size() > 8192) {
+  if(lastFieldName_.size() > 1024 || buf_.size() > 8192) {
     throw DL_ABORT_EX("Too large HTTP header");
   }
-
   lastBytesProcessed_ = i;
   headers_.append(&data[0], &data[i]);
   return state_ == HEADERS_COMPLETE;