feature: added new config directive srcache_store_ranges for storing 206 Partial Content responses generated by the standard ngx_http_range_filter_module.

Author: agentzh

src/ngx_http_srcache_filter_module.c

@@ -171,6 +171,13 @@ static ngx_command_t  ngx_http_srcache_commands[] = {
       offsetof(ngx_http_srcache_loc_conf_t, pass_headers),
       NULL },
 
+    { ngx_string("srcache_store_ranges"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_ranges),
+      NULL },
+
     { ngx_string("srcache_ignore_content_encoding"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -271,6 +278,7 @@ ngx_http_srcache_create_loc_conf(ngx_conf_t *cf)
     conf->store_private = NGX_CONF_UNSET;
     conf->store_no_store = NGX_CONF_UNSET;
     conf->store_no_cache = NGX_CONF_UNSET;
+    conf->store_ranges = NGX_CONF_UNSET;
 
     conf->max_expire = NGX_CONF_UNSET;
     conf->default_expire = NGX_CONF_UNSET;
@@ -326,6 +334,7 @@ ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->store_private, prev->store_private, 0);
     ngx_conf_merge_value(conf->store_no_store, prev->store_no_store, 0);
     ngx_conf_merge_value(conf->store_no_cache, prev->store_no_cache, 0);
+    ngx_conf_merge_value(conf->store_ranges, prev->store_ranges, 0);
 
     ngx_conf_merge_value(conf->max_expire, prev->max_expire, 0);
     ngx_conf_merge_value(conf->default_expire, prev->default_expire, 60);

src/ngx_http_srcache_filter_module.h

@@ -69,6 +69,7 @@ typedef struct {
     ngx_flag_t                       store_private;
     ngx_flag_t                       store_no_store;
     ngx_flag_t                       store_no_cache;
+    ngx_flag_t                       store_ranges;
 
     ngx_flag_t                       ignore_content_encoding;
 

src/ngx_http_srcache_store.c

@@ -13,6 +13,7 @@
 #include "ngx_http_srcache_store.h"
 #include "ngx_http_srcache_fetch.h"
 #include "ngx_http_srcache_util.h"
+#include <assert.h>
 
 
 static ngx_int_t ngx_http_srcache_store_post_subrequest(ngx_http_request_t *r,
@@ -259,7 +260,12 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
         r->header_only = 1;
     }
 
-    return NGX_OK;
+    /* store the response header to ctx->body_to_cache */
+    if (ngx_http_srcache_store_response_header(r, ctx) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    return ngx_http_srcache_next_header_filter(r);
 }
 
 
@@ -392,15 +398,27 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     if (ctx->store_response) {
         dd("storing the response: %p", in);
 
-        if (ctx->response_length == 0) {
-            /* store the response header to ctx->body_to_cache */
-            if (ngx_http_srcache_store_response_header(r, ctx) == NGX_ERROR) {
-                return NGX_ERROR;
-            }
+        slcf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+        if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT
+            && ctx->http_status == NGX_HTTP_OK)
+        {
+            u_char *p;
 
-            if (ngx_http_srcache_next_header_filter(r) == NGX_ERROR) {
-                return NGX_ERROR;
+            if (!slcf->store_ranges) {
+                ctx->store_response = 0;
+                goto done;
             }
+
+            dd("fix 206 status code");
+
+            /* handle 206 Partial Content generated by the range filter */
+            cl = ctx->body_to_cache;
+            assert(cl && cl->buf && cl->buf->last - cl->buf->pos > 12);
+            p = cl->buf->pos + sizeof("HTTP/1.x 20") - 1;
+            *p = '6';
+
+            ctx->http_status = NGX_HTTP_PARTIAL_CONTENT;
         }
 
         for (cl = in; cl; cl = cl->next) {
@@ -411,8 +429,6 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             }
         }
 
-        slcf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
-
         if (slcf->store_max_size != 0
             && ctx->response_length > slcf->store_max_size)
         {