github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[elasticsearch/proxy] use different code path with erorr

Browse source
This commit is contained in:
spalger 2016-10-19 12:06:39 -07:00
parent e100e1f5c9
commit fec5e1a2dc
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core_plugins/elasticsearch/lib/create_proxy.js
View file

@ -20,14 +20,17 @@ function createProxy(server, method, route, config) {
xforward: true,
timeout: server.config().get('elasticsearch.requestTimeout'),
onResponse: function (err, responseFromUpstream, request, reply) {
const upstreamLocation = responseFromUpstream.headers.location;
const response = reply(err, responseFromUpstream);
// Workaround for #8705 until hapi has been updated to >= 15.0.0
if (upstreamLocation) {
delete responseFromUpstream.headers.location;
response.location(encodeURI(upstreamLocation));
if (err) {
reply(err);
return;
}
if (responseFromUpstream.headers.location) {
// TODO: Workaround for #8705 until hapi has been updated to >= 15.0.0
responseFromUpstream.headers.location = encodeURI(responseFromUpstream.headers.location);
}
reply(null, responseFromUpstream);
}
}
},