rgw: support partial content (206) response

Couldn't get this one to work yet, as apache (or probably one of
the apache filters) rewrites the content-length value and sets
it to zero.

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 0edad78ecc46f088a4cb8c9bb0e0e5405cc9e91a..54a2c94fb4bd6c2769cdb9bc12a043999fab3a42 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -156,8 +156,8 @@ void RGWGetObj::execute()
       goto done;
     }
 
-    ofs += len;
     send_response(handle);
+    ofs += len;
     free(data);
   }
 

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index f9dd055db30d4cd6f2462f3df6dbce72a4a4acb3..78e782a447b2c3b5f27a80c82c16aa66c3807a20 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -22,6 +22,7 @@ struct errno_http {
 
 static struct errno_http hterrs[] = {
     { 0, "200", "" },
+    { 206, "206", "" },
     { EINVAL, "400", "InvalidArgument" },
     { EACCES, "403", "AccessDenied" },
     { EPERM, "403", "AccessDenied" },
@@ -34,6 +35,7 @@ static struct errno_http hterrs[] = {
 
 void dump_errno(struct req_state *s, int err, struct rgw_err *rgwerr)
 {
+  int orig_err = err;
   const char *err_str;
   const char *code = (rgwerr ? rgwerr->code : NULL);
 
@@ -59,7 +61,7 @@ void dump_errno(struct req_state *s, int err, struct rgw_err *rgwerr)
   }
 
   dump_status(s, err_str);
-  if (err) {
+  if (orig_err < 0) {
     s->err_exist = true;
     s->err.code = code;
     s->err.message = (rgwerr ? rgwerr->message : NULL);
@@ -183,6 +185,12 @@ void abort_early(struct req_state *s, int err)
   end_header(s);
 }
 
+void dump_range(struct req_state *s, off_t ofs, off_t end)
+{
+    CGI_PRINTF(s->fcgx->out,"Accept-Ranges: bytes\n", "");
+    CGI_PRINTF(s->fcgx->out,"Content-Range: bytes %d-%d/%d\n", (int)ofs, (int)end, (int)end + 1);
+}
+
 int RGWGetObj_REST::get_params()
 {
   range_str = FCGX_GetParam("HTTP_RANGE", s->fcgx->envp);
@@ -202,6 +210,8 @@ int RGWGetObj_REST::send_response(void *handle)
     goto send_data;
 
   if (get_data && !ret) {
+    if (range_str)
+      dump_range(s, ofs, end);
     dump_content_length(s, total_len);
   }
   if (!ret) {
@@ -223,6 +233,11 @@ int RGWGetObj_REST::send_response(void *handle)
        }
     }
   }
+
+
+  if (range_str && !ret)
+    ret = 206; /* partial content */
+
   dump_errno(s, ret, &err);
   end_header(s, content_type);