thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69601 from ClickHouse/fix-tsan-writebufferfromhttpserverresponse

Browse Source 
Try to fix data race in `WriteBufferFromHTTPServerResponse`
This commit is contained in:
Konstantin Bogdanov 2024-09-17 00:23:17 +00:00 committed by GitHub
commit a329150eef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
View File

@ -17,9 +17,7 @@ void WriteBufferFromHTTPServerResponse::startSendHeaders()
{ {
headers_started_sending = true; headers_started_sending = true;
if (response.getChunkedTransferEncoding()) if (!response.getChunkedTransferEncoding() && response.getContentLength() == Poco::Net::HTTPMessage::UNKNOWN_CONTENT_LENGTH)
setChunked();
else if (response.getContentLength() == Poco::Net::HTTPMessage::UNKNOWN_CONTENT_LENGTH)
{ {
/// In case there is no Content-Length we cannot use keep-alive, /// In case there is no Content-Length we cannot use keep-alive,
/// since there is no way to know when the server send all the /// since there is no way to know when the server send all the
@ -134,6 +132,8 @@ WriteBufferFromHTTPServerResponse::WriteBufferFromHTTPServerResponse(
, response(response_) , response(response_)
, is_http_method_head(is_http_method_head_) , is_http_method_head(is_http_method_head_)
{ {
if (response.getChunkedTransferEncoding())
setChunked();
} }

10
src/Server/StaticRequestHandler.cpp
View File

@ -90,15 +90,15 @@ static inline void trySendExceptionToClient(
void StaticRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & /*write_event*/) void StaticRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & /*write_event*/)
{ {
applyHTTPResponseHeaders(response, http_response_headers_override);
if (request.getVersion() == Poco::Net::HTTPServerRequest::HTTP_1_1)
response.setChunkedTransferEncoding(true);
auto out = responseWriteBuffer(request, response); auto out = responseWriteBuffer(request, response);
try try
{ {
applyHTTPResponseHeaders(response, http_response_headers_override);
if (request.getVersion() == Poco::Net::HTTPServerRequest::HTTP_1_1)
response.setChunkedTransferEncoding(true);
/// Workaround. Poco does not detect 411 Length Required case. /// Workaround. Poco does not detect 411 Length Required case.
if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST && !request.getChunkedTransferEncoding() && !request.hasContentLength()) if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST && !request.getChunkedTransferEncoding() && !request.hasContentLength())
throw Exception(ErrorCodes::HTTP_LENGTH_REQUIRED, throw Exception(ErrorCodes::HTTP_LENGTH_REQUIRED,