comparison src/http/modules/ngx_http_range_filter_module.c @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 8fbdd980b527 8246d8a2c2be
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
257 if (r->headers_out.accept_ranges == NULL) { 257 if (r->headers_out.accept_ranges == NULL) {
258 return NGX_ERROR; 258 return NGX_ERROR;
259 } 259 }
260 260
261 r->headers_out.accept_ranges->hash = 1; 261 r->headers_out.accept_ranges->hash = 1;
262 r->headers_out.accept_ranges->key.len = sizeof("Accept-Ranges") - 1; 262 ngx_str_set(&r->headers_out.accept_ranges->key, "Accept-Ranges");
263 r->headers_out.accept_ranges->key.data = (u_char *) "Accept-Ranges"; 263 ngx_str_set(&r->headers_out.accept_ranges->value, "bytes");
264 r->headers_out.accept_ranges->value.len = sizeof("bytes") - 1;
265 r->headers_out.accept_ranges->value.data = (u_char *) "bytes";
266 264
267 return ngx_http_next_header_filter(r); 265 return ngx_http_next_header_filter(r);
268 } 266 }
269 267
270 268
388 } 386 }
389 387
390 r->headers_out.content_range = content_range; 388 r->headers_out.content_range = content_range;
391 389
392 content_range->hash = 1; 390 content_range->hash = 1;
393 content_range->key.len = sizeof("Content-Range") - 1; 391 ngx_str_set(&content_range->key, "Content-Range");
394 content_range->key.data = (u_char *) "Content-Range";
395 392
396 content_range->value.data = ngx_pnalloc(r->pool, 393 content_range->value.data = ngx_pnalloc(r->pool,
397 sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN); 394 sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
398 if (content_range->value.data == NULL) { 395 if (content_range->value.data == NULL) {
399 return NGX_ERROR; 396 return NGX_ERROR;
553 } 550 }
554 551
555 r->headers_out.content_range = content_range; 552 r->headers_out.content_range = content_range;
556 553
557 content_range->hash = 1; 554 content_range->hash = 1;
558 content_range->key.len = sizeof("Content-Range") - 1; 555 ngx_str_set(&content_range->key, "Content-Range");
559 content_range->key.data = (u_char *) "Content-Range";
560 556
561 content_range->value.data = ngx_pnalloc(r->pool, 557 content_range->value.data = ngx_pnalloc(r->pool,
562 sizeof("bytes */") - 1 + NGX_OFF_T_LEN); 558 sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
563 if (content_range->value.data == NULL) { 559 if (content_range->value.data == NULL) {
564 return NGX_ERROR; 560 return NGX_ERROR;