[elasticsearch/proxy] use different code path with erorr

elastic · Oct 19, 2016 · fec5e1a · fec5e1a
1 parent e100e1f
commit fec5e1a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/core_plugins/elasticsearch/lib/create_proxy.js b/src/core_plugins/elasticsearch/lib/create_proxy.js
@@ -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);
+          if (err) {
+            reply(err);
+            return;
+          }
 
-          // Workaround for #8705 until hapi has been updated to >= 15.0.0
-          if (upstreamLocation) {
-            delete responseFromUpstream.headers.location;
-            response.location(encodeURI(upstreamLocation));
+          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);
         }
       }
     },