Skip to content
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.

Sign up for GitHub

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

Jump to bottom

keep the persistent connection only if rosmaster supports http1.1 #2208

Merged
merged 4 commits into from
Dec 3, 2021
Merged

keep the persistent connection only if rosmaster supports http1.1 #2208

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cb7602
keep the persistent connection only if rosmaster supports http1.1
Nov 30, 2021
0ba7104
Revert "keep the persistent connection only if rosmaster supports htt…
Dec 3, 2021
7750cc5
fix without breaking ABI
Dec 3, 2021
f82f4b2
Update comment
jacobperron Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions utilities/xmlrpcpp/src/XmlRpcClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,20 @@ XmlRpcClient::execute(const char* method, XmlRpcValue const& params, XmlRpcValue
double msTime = -1.0; // Process until exit is called
_disp.work(msTime);

if (_connectionState != IDLE || ! parseResponse(result))
if (_connectionState != IDLE || ! parseResponse(result)) {
_header = "";
return false;
}

// close() if server does not supports HTTP1.1
// otherwise, reusing the socket to write leads to a SIGPIPE because
// the remote server could shut down the corresponding socket.
if (_header.find("HTTP/1.1 200 OK", 0, 15) != 0) {
close();
}

XmlRpcUtil::log(1, "XmlRpcClient::execute: method %s completed.", method);
_header = "";
_response = "";
return true;
}
Expand Down Expand Up @@ -454,7 +464,6 @@ XmlRpcClient::readHeader()

// Otherwise copy non-header data to response buffer and set state to read response.
_response = bp;
_header = ""; // should parse out any interesting bits from the header (connection, etc)...
_connectionState = READ_RESPONSE;
return true; // Continue monitoring this source
}
Expand Down