safety first: turn off sync/async mixing for HTTPS in general

jsteemann · jsteemann · commit 036e28b1ccc9 · 2018-09-20T13:23:39.000+02:00
diff --git a/arangod/GeneralServer/HttpCommTask.cpp b/arangod/GeneralServer/HttpCommTask.cpp
@@ -70,6 +70,13 @@ HttpCommTask::HttpCommTask(Scheduler* scheduler, GeneralServer* server,
   ConnectionStatistics::SET_HTTP(_connectionStatistics);
 }
 
+// whether or not this task can mix sync and async I/O
+bool HttpCommTask::canUseMixedIO() const {
+  // in case SSL is used, we cannot use a combination of sync and async I/O
+  // because that will make TLS fall apart
+  return !_peer->isEncrypted();
+}
+
 /// @brief send error response including response body
 void HttpCommTask::addSimpleResponse(rest::ResponseCode code, rest::ContentType respType,
                                      uint64_t /*messageId*/, velocypack::Buffer<uint8_t>&& buffer) {
diff --git a/arangod/GeneralServer/HttpCommTask.h b/arangod/GeneralServer/HttpCommTask.h
@@ -25,9 +25,7 @@ class HttpCommTask final : public GeneralCommTask {
   }
   
   // whether or not this task can mix sync and async I/O
-  // this is always true for the HTTPCommTask, because we are not
-  // multiplexing I/O
-  bool canUseMixedIO() const override { return true; } 
+  bool canUseMixedIO() const override;
   
  private:
   bool processRead(double startTime) override;

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ class HttpCommTask final : public GeneralCommTask {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// whether or not this task can mix sync and async I/O`
`28`		`- // this is always true for the HTTPCommTask, because we are not`
`29`		`- // multiplexing I/O`
`30`		`- bool canUseMixedIO() const override { return true; }`
	`28`	`+ bool canUseMixedIO() const override;`
`31`	`29`
`32`	`30`	`private:`
`33`	`31`	`bool processRead(double startTime) override;`