Skip to content

Commit

Permalink
Merge pull request #1909 from Expensify/main
Browse files Browse the repository at this point in the history
Update expensify_prod branch
  • Loading branch information
johnmlee101 authored Oct 21, 2024
2 parents eab80d2 + 02829cc commit d5df728
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions libstuff/SHTTPSManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ void SStandaloneHTTPSManager::postPoll(fd_map& fdm, SStandaloneHTTPSManager::Tra
// Shut down the socket, we're done with it.
transaction.s->shutdown(Socket::CLOSED);

// This is supposed to check for a "200 OK" response, which it does very poorly. It also checks for message
// This is supposed to check for a "200" response, which it does very poorly. It also checks for message
// content. Why this is the what constitutes a valid response is lost to time. Any well-formed response should
// be valid here, and this should get cleaned up. However, this requires testing anything that might rely on
// the existing behavior, which is an exercise for later.
if (SContains(transaction.fullResponse.methodLine, " 200 ") || transaction.fullResponse.content.size()) {
if (SContains(transaction.fullResponse.methodLine, " 200") || transaction.fullResponse.content.size()) {
// Pass the transaction down to the subclass.
_onRecv(&transaction);
} else {
Expand Down
3 changes: 2 additions & 1 deletion libstuff/SLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ static const set<string> PARAMS_WHITELIST = {
"policyID",
"companyName",
"companyWebsite",
"invoice"
"invoice",
"policyAccountID"
};

string addLogParams(string&& message, const map<string, string>& params) {
Expand Down

0 comments on commit d5df728

Please sign in to comment.