Compare commits

...

4 Commits

Author SHA1 Message Date
Patrick Niklaus 45516ef534 Enable travis builds for 5.2 branch 2016-06-14 14:36:41 +02:00
Patrick Niklaus 532fda267f [skip ci] Update changelog for 5.2.1
Conflicts:
	CHANGELOG.md
2016-06-14 14:32:33 +02:00
Daniel Patterson 494845b160 Copy data to beginning of buffer, not end. (#2542)
Copy data to beginning of buffer, not end.
2016-06-13 12:59:42 -07:00
Patrick Niklaus 0fc823041e Removed debug code 2016-06-13 17:57:33 +02:00
4 changed files with 14 additions and 5 deletions
+1
View File
@@ -13,6 +13,7 @@ notifications:
branches: branches:
only: only:
- master - master
- "5.2"
cache: cache:
ccache: true ccache: true
+11 -1
View File
@@ -1,5 +1,15 @@
# 5.2.2
Changes from 5.2.1
- Bugfixes:
- Buffer overrun in tile plugin response handling
# 5.2.1
Changes from 5.2.0
- Bugfixes:
- Removed debug statement that was spamming the console
# 5.2.0 # 5.2.0
Changes form 5.2.0 RC2 Changes from 5.2.0 RC2
- Bugfixes: - Bugfixes:
- Fixed crash when loading shared memory caused by invalid OSM IDs segment size. - Fixed crash when loading shared memory caused by invalid OSM IDs segment size.
- Various small instructions handling fixes - Various small instructions handling fixes
-1
View File
@@ -550,7 +550,6 @@ std::vector<RouteStep> removeNoTurnInstructions(std::vector<RouteStep> steps)
// that we come across. // that we come across.
std::vector<RouteStep> postProcess(std::vector<RouteStep> steps) std::vector<RouteStep> postProcess(std::vector<RouteStep> steps)
{ {
print(steps);
// the steps should always include the first/last step in form of a location // the steps should always include the first/last step in form of a location
BOOST_ASSERT(steps.size() >= 2); BOOST_ASSERT(steps.size() >= 2);
if (steps.size() == 2) if (steps.size() == 2)
+2 -3
View File
@@ -105,11 +105,10 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
else else
{ {
BOOST_ASSERT(result.is<std::string>()); BOOST_ASSERT(result.is<std::string>());
current_reply.content.resize(current_reply.content.size() + current_reply.content.resize(result.get<std::string>().size());
result.get<std::string>().size());
std::copy(result.get<std::string>().cbegin(), std::copy(result.get<std::string>().cbegin(),
result.get<std::string>().cend(), result.get<std::string>().cend(),
current_reply.content.end()); current_reply.content.begin());
current_reply.headers.emplace_back("Content-Type", "application/x-protobuf"); current_reply.headers.emplace_back("Content-Type", "application/x-protobuf");
} }