-
Notifications
You must be signed in to change notification settings - Fork 71
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
1060: Catching up a few bug fixes #852
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -153,7 +153,7 @@ struct Response | |
{ | ||
BMCWEB_LOG_DEBUG << this << " Clearing response containers"; | ||
stringResponse.emplace(response_type{}); | ||
jsonValue.clear(); | ||
jsonValue = nullptr; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. jsonValue is an object not a pointer right? should't it be like jsonValue=nlohmann::json(); There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think both ways can be used - nlohmann/json#2156 |
||
completed = false; | ||
expectedHash = std::nullopt; | ||
} | ||
|
@@ -244,7 +244,7 @@ struct Response | |
addHeader(boost::beast::http::field::etag, hexVal); | ||
if (expectedHash && hexVal == *expectedHash) | ||
{ | ||
jsonValue.clear(); | ||
jsonValue = nullptr; | ||
result(boost::beast::http::status::not_modified); | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we take the latest code from upstream? It does not uses socket pointer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For 1060, we can't rebase with upstream but we try to catch up some potentially critical bug fixes if there are.
However, this particular lines are already synced with upstream - related to socket handling.