Merge pull request getodk#466 from ggalmazor/issue_455_restore_locati…

…on_header_in_HEAD_responses Issue getodk#455 Restore the Location header in HEAD pre-flight responses
yanokwa · Apr 24, 2019 · be11e5b · be11e5b
2 parents 6bd5f5f + e75a671
commit be11e5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/org/opendatakit/aggregate/servlet/FormUploadServlet.java b/src/main/java/org/opendatakit/aggregate/servlet/FormUploadServlet.java
@@ -189,6 +189,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
   @Override
   protected void doHead(HttpServletRequest req, HttpServletResponse resp) {
     addOpenRosaHeaders(resp);
+    // TODO Remove this header when no client relies on it to identify legacy Aggregate servers (v0.9 or older)
+    resp.setHeader("Location", String.format("%s/%s", ContextFactory.getCallingContext(this, req).getServerURL(), ADDR));
     resp.setStatus(204);
   }
 

diff --git a/src/main/java/org/opendatakit/aggregate/servlet/ResetUsersAndPermissionsServlet.java b/src/main/java/org/opendatakit/aggregate/servlet/ResetUsersAndPermissionsServlet.java
@@ -179,6 +179,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws
   @Override
   protected void doHead(HttpServletRequest req, HttpServletResponse resp) {
     addOpenRosaHeaders(resp);
+    // TODO Remove this header when no client relies on it to identify legacy Aggregate servers (v0.9 or older)
+    resp.setHeader("Location", String.format("%s/%s", ContextFactory.getCallingContext(this, req).getServerURL(), ADDR));
     resp.setStatus(204);
   }
 

diff --git a/src/main/java/org/opendatakit/aggregate/servlet/SubmissionServlet.java b/src/main/java/org/opendatakit/aggregate/servlet/SubmissionServlet.java
@@ -190,6 +190,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
   @Override
   protected void doHead(HttpServletRequest req, HttpServletResponse resp) {
     addOpenRosaHeaders(resp);
+    // TODO Remove this header when no client relies on it to identify legacy Aggregate servers (v0.9 or older)
+    resp.setHeader("Location", String.format("%s/%s", ContextFactory.getCallingContext(this, req).getServerURL(), ADDR));
     resp.setStatus(204);
   }