Be lenient about Connection header contents when Upgrade header is pr…

…esent

This is a workaround for rstudio/rstudio#2940. It
stops an erroneously sent "Connection: close" header from breaking an
otherwise legit websocket request.

src/httprequest.cpp

@@ -418,7 +418,7 @@ int HttpRequest::_on_message_complete(http_parser* pParser) {
   ASSERT_BACKGROUND_THREAD()
   trace("HttpRequest::_on_message_complete");
 
-  if (pParser->upgrade)
+  if (pParser->upgrade || (pParser->flags & F_UPGRADE))
     return 0;
 
   boost::function<void(boost::shared_ptr<HttpResponse>)> schedule_bg_callback(
@@ -706,7 +706,7 @@ void HttpRequest::_parse_http_data(char* buffer, const ssize_t n) {
     // buffer.
     _requestBuffer.insert(_requestBuffer.end(), buffer + parsed, buffer + n);
 
-  } else if (_parser.upgrade) {
+  } else if (_parser.upgrade || (_parser.flags & F_UPGRADE)) {
     char* pData = buffer + parsed;
     size_t pDataLen = n - parsed;