ngx_http_bytes_filter_module: ngx_http_bytes_filter

annotate ngx_http_bytes_filter_module.c @ 5:be5e612dd602

More readable calculations, no functional changes.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 03 Jul 2008 13:23:06 +0400
parents	ab9f96327bb6
children	2e1eaf93e67e

rev	line source
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	1
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	2 /*
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	3 * Copyright (C) Maxim Dounin
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	4 */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	5
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	6 #include <ngx_config.h>
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	7 #include <ngx_core.h>
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	8 #include <ngx_http.h>
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	9
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	10
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	11 typedef struct {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	12 ngx_flag_t enable;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	13 } ngx_http_bytes_conf_t;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	14
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	15
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	16 typedef struct {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	17 off_t start;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	18 off_t end;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	19 } ngx_http_bytes_t;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	20
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	21
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	22 typedef struct {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	23 off_t offset;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	24 ngx_array_t ranges;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	25 ngx_http_bytes_t *range;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	26 } ngx_http_bytes_ctx_t;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	27
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	28
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	29 static void ngx_http_bytes_create_conf(ngx_conf_t cf);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	30 static char ngx_http_bytes_merge_conf(ngx_conf_t cf, void *parent,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	31 void *child);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	32 static ngx_int_t ngx_http_bytes_init(ngx_conf_t *cf);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	33
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	34
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	35 static ngx_command_t ngx_http_bytes_commands[] = {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	36
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	37 { ngx_string("bytes"),
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	38 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	39 ngx_conf_set_flag_slot,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	40 NGX_HTTP_LOC_CONF_OFFSET,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	41 offsetof(ngx_http_bytes_conf_t, enable),
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	42 NULL },
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	43
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	44 ngx_null_command
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	45 };
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	46
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	47
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	48 static ngx_http_module_t ngx_http_bytes_module_ctx = {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	49 NULL, /* preconfiguration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	50 ngx_http_bytes_init, /* postconfiguration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	51
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	52 NULL, /* create main configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	53 NULL, /* init main configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	54
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	55 NULL, /* create server configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	56 NULL, /* merge server configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	57
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	58 ngx_http_bytes_create_conf, /* create location configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	59 ngx_http_bytes_merge_conf /* merge location configuration */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	60 };
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	61
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	62
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	63 ngx_module_t ngx_http_bytes_filter_module = {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	64 NGX_MODULE_V1,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	65 &ngx_http_bytes_module_ctx, /* module context */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	66 ngx_http_bytes_commands, /* module directives */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	67 NGX_HTTP_MODULE, /* module type */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	68 NULL, /* init master */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	69 NULL, /* init module */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	70 NULL, /* init process */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	71 NULL, /* init thread */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	72 NULL, /* exit thread */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	73 NULL, /* exit process */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	74 NULL, /* exit master */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	75 NGX_MODULE_V1_PADDING
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	76 };
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	77
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	78
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	79 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	80 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	81
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	82
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	83 static ngx_int_t
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	84 ngx_http_bytes_header_filter(ngx_http_request_t *r)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	85 {
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	86 u_char p, last;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	87 off_t start, end, len;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	88 ngx_uint_t suffix, bad;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	89 ngx_http_bytes_t *range;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	90 ngx_http_bytes_conf_t *conf;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	91 ngx_http_bytes_ctx_t *ctx;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	92 enum {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	93 sw_start = 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	94 sw_first_byte_pos,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	95 sw_first_byte_pos_n,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	96 sw_last_byte_pos,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	97 sw_last_byte_pos_n,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	98 sw_done
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	99 } state = 0;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	100
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	101 conf = ngx_http_get_module_loc_conf(r, ngx_http_bytes_filter_module);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	102
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	103 if (!conf->enable \|\| r->args.len == 0) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	104 return ngx_http_next_header_filter(r);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	105 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	106
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	107 p = (u_char *) ngx_strnstr(r->args.data, "bytes=", r->args.len);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	108
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	109 if (p == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	110 return ngx_http_next_header_filter(r);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	111 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	112
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	113 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	114 "bytes header filter: r %p", r);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	115
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	116 p += sizeof("bytes=") - 1;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	117 last = r->args.data + r->args.len;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	118
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	119 /* create context */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	120
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	121 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_bytes_ctx_t));
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	122 if (ctx == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	123 return NGX_ERROR;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	124 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	125
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	126 if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_bytes_t))
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	127 == NGX_ERROR)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	128 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	129 return NGX_ERROR;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	130 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	131
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	132 /*
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	133 * bytes= contain ranges compatible with RFC 2616, "14.35.1 Byte Ranges",
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	134 * but no whitespaces permitted
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	135 */
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	136
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	137 bad = 0;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	138 len = 0;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	139
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	140 while (p < last) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	141
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	142 switch (state) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	143
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	144 case sw_start:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	145 case sw_first_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	146 if (*p == '-') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	147 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	148 suffix = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	149 state = sw_last_byte_pos;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	150 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	151 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	152 suffix = 0;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	153 start = 0;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	154 state = sw_first_byte_pos_n;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	155
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	156 /* fall through */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	157
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	158 case sw_first_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	159 if (*p == '-') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	160 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	161 state = sw_last_byte_pos;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	162 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	163 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	164 if (p < '0' \|\| p > '9') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	165 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	166 "bytes header filter: unexpected char '%c'"
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	167 " (expected first-byte-pos)", *p);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	168 bad = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	169 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	170 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	171 start = start * 10 + *p - '0';
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	172 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	173 break;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	174
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	175 case sw_last_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	176 if (p == ',' \|\| p == '&' \|\| *p == ';') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	177 /* no last byte pos, assume end of file */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	178 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	179 state = sw_done;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	180 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	181 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	182 end = 0;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	183 state = sw_last_byte_pos_n;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	184
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	185 /* fall though */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	186
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	187 case sw_last_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	188 if (p == ',' \|\| p == '&' \|\| *p == ';') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	189 state = sw_done;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	190 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	191 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	192 if (p < '0' \|\| p > '9') {
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	193 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	194 "bytes header filter: unexpected char '%c'"
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	195 " (expected last-byte-pos)", *p);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	196 bad = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	197 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	198 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	199 end = end * 10 + *p - '0';
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	200 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	201 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	202
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	203 case sw_done:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	204 range = ngx_array_push(&ctx->ranges);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	205 if (range == NULL) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	206 return NGX_ERROR;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	207 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	208
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	209 if (suffix) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	210 start = r->headers_out.content_length_n - end;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	211 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	212 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	213
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	214 /* note: range->end isn't inclusive, while last-byte-pos is */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	215
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	216 range->start = start;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	217 range->end = end + 1;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	218 len += range->end - range->start;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	219
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	220 if (*p == ',') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	221 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	222 state = sw_first_byte_pos;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	223 break;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	224 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	225
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	226 goto done;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	227
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	228 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	229
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	230 if (bad) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	231 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	232 "bytes header filter: invalid range specification");
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	233 return ngx_http_next_header_filter(r);
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	234 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	235 }
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	236
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	237 switch (state) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	238
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	239 case sw_last_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	240 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	241
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	242 /* fall through */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	243
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	244 case sw_last_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	245 range = ngx_array_push(&ctx->ranges);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	246 if (range == NULL) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	247 return NGX_ERROR;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	248 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	249
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	250 if (suffix) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	251 start = r->headers_out.content_length_n - end;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	252 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	253 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	254
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	255 range->start = start;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	256 range->end = end + 1;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	257 len += range->end - range->start;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	258
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	259 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	260
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	261 default:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	262 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	263 "bytes header filter: invalid range specification");
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	264 return ngx_http_next_header_filter(r);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	265
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	266 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	267
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	268 done:
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	269 r->headers_out.content_length_n = len;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	270
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	271 ngx_http_set_ctx(r, ctx, ngx_http_bytes_filter_module);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	272
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	273 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	274 "bytes header filter: new length %O",
13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	275 r->headers_out.content_length_n);
13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	276
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	277 return ngx_http_next_header_filter(r);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	278 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	279
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	280
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	281 static ngx_int_t
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	282 ngx_http_bytes_body_filter(ngx_http_request_t r, ngx_chain_t in)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	283 {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	284 off_t size;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	285 ngx_uint_t i;
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	286 ngx_chain_t *ll, cl, *dcl;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	287 ngx_buf_t buf, b;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	288 ngx_http_bytes_ctx_t *ctx;
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	289 ngx_http_bytes_t range, last;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	290
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	291 if (in == NULL) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	292 return ngx_http_next_body_filter(r, in);
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	293 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	294
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	295 ctx = ngx_http_get_module_ctx(r, ngx_http_bytes_filter_module);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	296
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	297 if (ctx == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	298 return ngx_http_next_body_filter(r, in);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	299 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	300
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	301 buf = in->buf;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	302
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	303 if (ngx_buf_special(buf)) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	304 return ngx_http_next_body_filter(r, in);
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	305 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	306
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	307 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	308 "bytes body filter: r %p, in %p", r, in);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	309
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	310 range = ctx->ranges.elts;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	311
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	312 for (i = 0; i < ctx->ranges.nelts; i++) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	313 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	314 "bytes body filter: %O-%O", range->start, range->end);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	315 range++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	316 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	317
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	318 range = ctx->range;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	319
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	320 if (range == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	321 range = ctx->range = ctx->ranges.elts;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	322 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	323
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	324 last = ctx->ranges.elts;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	325 last += ctx->ranges.nelts;
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	326
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	327 #if 0
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	328 /* ... temp, rewrite */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	329
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	330 if (ctx->ranges.nelts == 1) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	331
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	332 if (buf->in_file) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	333 buf->file_pos = range->start;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	334 buf->file_last = range->end;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	335 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	336
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	337 if (ngx_buf_in_memory(buf)) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	338 buf->pos = buf->start + (size_t) range->start;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	339 buf->last = buf->start + (size_t) range->end;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	340 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	341
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	342 return ngx_http_next_body_filter(r, in);
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	343 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	344 #endif
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	345
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	346 /* ... */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	347
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	348 for (ll = &in, cl = in; cl; ll = &cl->next, cl = cl->next,
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	349 ctx->offset += size)
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	350 {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	351
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	352 buf = cl->buf;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	353 size = ngx_buf_size(buf);
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	354
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	355 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	356 "bytes body filter: b %d", size);
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	357
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	358 if (ngx_buf_special(buf)) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	359 /* pass out anyway */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	360 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	361 "bytes body filter: special buffer");
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	362 continue;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	363 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	364
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	365 next:
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	366 if (range->start > ctx->offset + size) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	367 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	368 "bytes body filter: fully ignored buffer");
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	369 *ll = cl->next;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	370 buf->pos = buf->last;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	371 continue;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	372 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	373
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	374 /* todo: do not create buffers/links if not needed */
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	375
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	376 b = ngx_calloc_buf(r->pool);
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	377 if (b == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	378 return NGX_ERROR;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	379 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	380
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	381 b->in_file = buf->in_file;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	382 b->temporary = buf->temporary;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	383 b->memory = buf->memory;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	384 b->mmap = buf->mmap;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	385 b->file = buf->file;
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	386
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	387 if (buf->in_file) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	388 b->file_pos = buf->file_pos;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	389 b->file_last = buf->file_last;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	390 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	391
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	392 if (ngx_buf_in_memory(buf)) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	393 b->pos = buf->pos;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	394 b->last = buf->last;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	395 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	396
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	397 dcl = ngx_alloc_chain_link(r->pool);
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	398 if (dcl == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	399 return NGX_ERROR;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	400 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	401
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	402 *ll = dcl;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	403 dcl->buf = b;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	404 dcl->next = cl->next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	405 ll = &dcl->next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	406
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	407 if (buf->last_buf && range == last - 1) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	408 b->last_buf = 1;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	409 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	410
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	411 if (b->in_file) {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	412
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	413 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	414 "bytes body filter: in file, %O-%O",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	415 b->file_pos, b->file_last);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	416
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	417 if (range->start > ctx->offset) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	418 b->file_pos += range->start - ctx->offset;
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	419 }
5 be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	420 if (range->end < ctx->offset + size) {
be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	421 b->file_last -= ctx->offset + size - range->end;
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	422 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	423
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	424 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	425 "bytes body filter: in file fixed, %O-%O",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	426 b->file_pos, b->file_last);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	427 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	428
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	429 if (ngx_buf_in_memory(b)) {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	430
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	431 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	432 "bytes body filter: in memory, %p-%p",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	433 b->pos, b->last);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	434
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	435 if (range->start > ctx->offset) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	436 b->pos += (size_t) (range->start - ctx->offset);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	437 }
5 be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	438 if (range->end < ctx->offset + size) {
be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	439 b->last -= (size_t) (ctx->offset + size - range->end);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	440 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	441
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	442 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	443 "bytes body filter: in memory fixed, %p-%p",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	444 b->pos, b->last);
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	445 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	446
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	447 if (range->end < ctx->offset + size) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	448 range++;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	449 if (range < last) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	450 goto next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	451 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	452 }
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	453 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	454
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	455 return ngx_http_next_body_filter(r, in);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	456 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	457
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	458
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	459 static void *
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	460 ngx_http_bytes_create_conf(ngx_conf_t *cf)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	461 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	462 ngx_http_bytes_conf_t *conf;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	463
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	464 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_bytes_conf_t));
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	465 if (conf == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	466 return NGX_CONF_ERROR;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	467 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	468
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	469 conf->enable = NGX_CONF_UNSET;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	470
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	471 return conf;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	472 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	473
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	474
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	475 static char *
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	476 ngx_http_bytes_merge_conf(ngx_conf_t cf, void parent, void *child)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	477 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	478 ngx_http_bytes_conf_t *prev = parent;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	479 ngx_http_bytes_conf_t *conf = child;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	480
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	481 ngx_conf_merge_value(conf->enable, prev->enable, 0);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	482
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	483 return NGX_CONF_OK;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	484 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	485
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	486
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	487 static ngx_int_t
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	488 ngx_http_bytes_init(ngx_conf_t *cf)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	489 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	490 ngx_http_next_header_filter = ngx_http_top_header_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	491 ngx_http_top_header_filter = ngx_http_bytes_header_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	492
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	493 ngx_http_next_body_filter = ngx_http_top_body_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	494 ngx_http_top_body_filter = ngx_http_bytes_body_filter;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	495
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	496 return NGX_OK;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	497 }

Mercurial > hg > ngx_http_bytes_filter_module

annotate ngx_http_bytes_filter_module.c @ 5:be5e612dd602