ngx_http_bytes_filter_module: ngx_http_bytes_filter

annotate ngx_http_bytes_filter_module.c @ 7:2e1eaf93e67e

Fix warnings.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Tue, 15 Jul 2008 06:19:09 +0400
parents	be5e612dd602
children	60d65f2acaed

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;
7 2e1eaf93e67e Fix warnings. Maxim Dounin <mdounin@mdounin.ru> parents: 5 diff changeset	139 suffix = 0;
2e1eaf93e67e Fix warnings. Maxim Dounin <mdounin@mdounin.ru> parents: 5 diff changeset	140 start = 0;
2e1eaf93e67e Fix warnings. Maxim Dounin <mdounin@mdounin.ru> parents: 5 diff changeset	141 end = 0;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	142
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	143 while (p < last) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	144
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	145 switch (state) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	146
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	147 case sw_start:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	148 case sw_first_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	149 if (*p == '-') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	150 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	151 suffix = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	152 state = sw_last_byte_pos;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	153 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	154 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	155 state = sw_first_byte_pos_n;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	156
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	157 /* fall through */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	158
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	159 case sw_first_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	160 if (*p == '-') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	161 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	162 state = sw_last_byte_pos;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	163 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	164 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	165 if (p < '0' \|\| p > '9') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	166 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	167 "bytes header filter: unexpected char '%c'"
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	168 " (expected first-byte-pos)", *p);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	169 bad = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	170 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	171 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	172 start = start * 10 + *p - '0';
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	173 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	174 break;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	175
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	176 case sw_last_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	177 if (p == ',' \|\| p == '&' \|\| *p == ';') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	178 /* no last byte pos, assume end of file */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	179 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	180 state = sw_done;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	181 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	182 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	183 end = 0;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	184 state = sw_last_byte_pos_n;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	185
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	186 /* fall though */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	187
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	188 case sw_last_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	189 if (p == ',' \|\| p == '&' \|\| *p == ';') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	190 state = sw_done;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	191 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	192 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	193 if (p < '0' \|\| p > '9') {
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	194 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	195 "bytes header filter: unexpected char '%c'"
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	196 " (expected last-byte-pos)", *p);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	197 bad = 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	198 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	199 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	200 end = end * 10 + *p - '0';
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	201 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	202 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	203
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	204 case sw_done:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	205 range = ngx_array_push(&ctx->ranges);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	206 if (range == NULL) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	207 return NGX_ERROR;
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
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	210 if (suffix) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	211 start = r->headers_out.content_length_n - end;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	212 end = r->headers_out.content_length_n - 1;
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
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	215 /* 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	216
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	217 range->start = start;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	218 range->end = end + 1;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	219 len += range->end - range->start;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	220
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	221 if (*p == ',') {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	222 p++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	223 state = sw_first_byte_pos;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	224 break;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	225 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	226
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	227 goto done;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	228
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	229 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	230
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	231 if (bad) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	232 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	233 "bytes header filter: invalid range specification");
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	234 return ngx_http_next_header_filter(r);
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	235 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	236 }
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	237
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	238 switch (state) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	239
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	240 case sw_last_byte_pos:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	241 end = r->headers_out.content_length_n - 1;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	242
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	243 /* fall through */
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	244
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	245 case sw_last_byte_pos_n:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	246 range = ngx_array_push(&ctx->ranges);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	247 if (range == NULL) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	248 return NGX_ERROR;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	249 }
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	250
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	251 if (suffix) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	252 start = r->headers_out.content_length_n - end;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	253 end = r->headers_out.content_length_n - 1;
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
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	256 range->start = start;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	257 range->end = end + 1;
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	258 len += range->end - range->start;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	259
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	260 break;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	261
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	262 default:
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	263 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	264 "bytes header filter: invalid range specification");
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	265 return ngx_http_next_header_filter(r);
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
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	269 done:
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	270 r->headers_out.content_length_n = len;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	271
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	272 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	273
2 13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	274 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	275 "bytes header filter: new length %O",
13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	276 r->headers_out.content_length_n);
13a2fbcc8bc4 Change Content-Length to match total requested length. Maxim Dounin <mdounin@mdounin.ru> parents: 1 diff changeset	277
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	278 return ngx_http_next_header_filter(r);
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
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	282 static ngx_int_t
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	283 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	284 {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	285 off_t size;
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	286 ngx_uint_t i;
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	287 ngx_chain_t *ll, cl, *dcl;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	288 ngx_buf_t buf, b;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	289 ngx_http_bytes_ctx_t *ctx;
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	290 ngx_http_bytes_t range, last;
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	291
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	292 if (in == NULL) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	293 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	294 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	295
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	296 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	297
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	298 if (ctx == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	299 return ngx_http_next_body_filter(r, in);
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	300 }
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	301
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	302 buf = in->buf;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	303
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	304 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	305 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	306 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	307
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	308 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	309 "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	310
1 6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	311 range = ctx->ranges.elts;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	312
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	313 for (i = 0; i < ctx->ranges.nelts; i++) {
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	314 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	315 "bytes body filter: %O-%O", range->start, range->end);
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	316 range++;
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	317 }
6b995d5251ec Implement bytes= argument parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 0 diff changeset	318
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	319 range = ctx->range;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	320
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	321 if (range == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	322 range = ctx->range = ctx->ranges.elts;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	325 last = ctx->ranges.elts;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	326 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	327
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	328 #if 0
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	329 /* ... temp, rewrite */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	330
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	331 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	332
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	333 if (buf->in_file) {
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	334 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	335 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	336 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	337
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	338 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	339 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	340 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	341 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	342
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	343 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	344 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	345 #endif
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 /* ... */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	348
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	349 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	350 ctx->offset += size)
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	351 {
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	352
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	353 buf = cl->buf;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	354 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	355
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	356 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	357 "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	358
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	359 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	360 /* pass out anyway */
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	361 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	362 "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	363 continue;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	364 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	365
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	366 next:
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	367 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	368 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	369 "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	370 *ll = cl->next;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	371 buf->pos = buf->last;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	372 continue;
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	373 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	374
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	375 /* todo: do not create buffers/links if not needed */
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	376
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	377 b = ngx_calloc_buf(r->pool);
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	378 if (b == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	379 return NGX_ERROR;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	382 b->in_file = buf->in_file;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	383 b->temporary = buf->temporary;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	384 b->memory = buf->memory;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	385 b->mmap = buf->mmap;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	386 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	387
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	388 if (buf->in_file) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	389 b->file_pos = buf->file_pos;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	390 b->file_last = buf->file_last;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	393 if (ngx_buf_in_memory(buf)) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	394 b->pos = buf->pos;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	395 b->last = buf->last;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	398 dcl = ngx_alloc_chain_link(r->pool);
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	399 if (dcl == NULL) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	400 return NGX_ERROR;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	403 *ll = dcl;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	404 dcl->buf = b;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	405 dcl->next = cl->next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	406 ll = &dcl->next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	407
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	408 if (buf->last_buf && range == last - 1) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	409 b->last_buf = 1;
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
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	412 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	413
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	414 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	415 "bytes body filter: in file, %O-%O",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	416 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	417
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	418 if (range->start > ctx->offset) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	419 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	420 }
5 be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	421 if (range->end < ctx->offset + size) {
be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	422 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	423 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	424
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	425 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	426 "bytes body filter: in file fixed, %O-%O",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	427 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	428 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	429
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	430 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	431
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	432 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	433 "bytes body filter: in memory, %p-%p",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	434 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	435
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	436 if (range->start > ctx->offset) {
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	437 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	438 }
5 be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	439 if (range->end < ctx->offset + size) {
be5e612dd602 More readable calculations, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4 diff changeset	440 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	441 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	442
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	443 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	444 "bytes body filter: in memory fixed, %p-%p",
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	445 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	446 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	447
4 ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	448 if (range->end < ctx->offset + size) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	449 range++;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	450 if (range < last) {
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	451 goto next;
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	452 }
ab9f96327bb6 Handle multiple ranges. Maxim Dounin <mdounin@mdounin.ru> parents: 3 diff changeset	453 }
3 3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	454 }
3e8648918913 Body filter buffers fixup, currently limited to one range only. Maxim Dounin <mdounin@mdounin.ru> parents: 2 diff changeset	455
0 8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	456 return ngx_http_next_body_filter(r, in);
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
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	460 static void *
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	461 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	462 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	463 ngx_http_bytes_conf_t *conf;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	464
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	465 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	466 if (conf == NULL) {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	467 return NGX_CONF_ERROR;
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
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	470 conf->enable = NGX_CONF_UNSET;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	471
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	472 return conf;
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
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	476 static char *
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	477 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	478 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	479 ngx_http_bytes_conf_t *prev = parent;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	480 ngx_http_bytes_conf_t *conf = child;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	481
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	482 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	483
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	484 return NGX_CONF_OK;
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
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	488 static ngx_int_t
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	489 ngx_http_bytes_init(ngx_conf_t *cf)
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	490 {
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	491 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	492 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	493
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	494 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	495 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	496
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	497 return NGX_OK;
8aec31ab4d52 Bytes filter module skeleton, currently does nothing. Maxim Dounin <mdounin@mdounin.ru> parents: diff changeset	498 }

Mercurial > hg > ngx_http_bytes_filter_module

annotate ngx_http_bytes_filter_module.c @ 7:2e1eaf93e67e