nginx: src/http/ngx_http_spdy_filter

annotate src/http/ngx_http_spdy_filter_module.c @ 5517:9d1479234f3c

SPDY: fixed off_t/size_t type conversions on 32 bits platforms. Parameters of ngx_http_spdy_filter_get_shadow() are changed from size_t to off_t since the last call of the function may get size and offset from the rest of a file buffer. This fixes possible data loss rightfully complained by MSVC on 32 bits systems where off_t is 8 bytes long while size_t is only 4 bytes. The other two type casts are needed just to suppress warnings about possible data loss also complained by MSVC but false positive in these cases.

author	Valentin Bartenev <vbart@nginx.com>
date	Wed, 15 Jan 2014 13:23:31 +0400
parents	439d05a037a3
children	d5de6c25b759

rev	line source
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	2 /*
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	3 * Copyright (C) Nginx, Inc.
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	4 * Copyright (C) Valentin V. Bartenev
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	5 */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	6
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	7
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	8 #include <ngx_config.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	9 #include <ngx_core.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	10 #include <ngx_http.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	11 #include <nginx.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	12 #include <ngx_http_spdy_module.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	13
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	14 #include <zlib.h>
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	15
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	16
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	17 #define ngx_http_spdy_nv_nsize(h) (NGX_SPDY_NV_NLEN_SIZE + sizeof(h) - 1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	18 #define ngx_http_spdy_nv_vsize(h) (NGX_SPDY_NV_VLEN_SIZE + sizeof(h) - 1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	19
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	20 #define ngx_http_spdy_nv_write_num ngx_spdy_frame_write_uint16
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	21 #define ngx_http_spdy_nv_write_nlen ngx_spdy_frame_write_uint16
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	22 #define ngx_http_spdy_nv_write_vlen ngx_spdy_frame_write_uint16
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	23
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	24 #define ngx_http_spdy_nv_write_name(p, h) \
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	25 ngx_cpymem(ngx_http_spdy_nv_write_nlen(p, sizeof(h) - 1), h, sizeof(h) - 1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	26
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	27 #define ngx_http_spdy_nv_write_val(p, h) \
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	28 ngx_cpymem(ngx_http_spdy_nv_write_vlen(p, sizeof(h) - 1), h, sizeof(h) - 1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	29
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	30
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	31 static ngx_chain_t ngx_http_spdy_send_chain(ngx_connection_t fc,
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	32 ngx_chain_t *in, off_t limit);
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	33
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	34 static ngx_inline ngx_int_t ngx_http_spdy_filter_send(
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	35 ngx_connection_t fc, ngx_http_spdy_stream_t stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	36
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	37 static ngx_chain_t *ngx_http_spdy_filter_get_shadow(
5517 9d1479234f3c SPDY: fixed off_t/size_t type conversions on 32 bits platforms. Valentin Bartenev <vbart@nginx.com> parents: 5516 diff changeset	38 ngx_http_spdy_stream_t stream, ngx_buf_t buf, off_t offset, off_t size);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	39 static ngx_http_spdy_out_frame_t *ngx_http_spdy_filter_get_data_frame(
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	40 ngx_http_spdy_stream_t stream, size_t len, ngx_chain_t first,
97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	41 ngx_chain_t *last);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	42
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	43 static ngx_int_t ngx_http_spdy_syn_frame_handler(
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	44 ngx_http_spdy_connection_t sc, ngx_http_spdy_out_frame_t frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	45 static ngx_int_t ngx_http_spdy_data_frame_handler(
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	46 ngx_http_spdy_connection_t sc, ngx_http_spdy_out_frame_t frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	47 static ngx_inline void ngx_http_spdy_handle_frame(
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	48 ngx_http_spdy_stream_t stream, ngx_http_spdy_out_frame_t frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	49 static ngx_inline void ngx_http_spdy_handle_stream(
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	50 ngx_http_spdy_connection_t sc, ngx_http_spdy_stream_t stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	51
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	52 static void ngx_http_spdy_filter_cleanup(void *data);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	53
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	54 static ngx_int_t ngx_http_spdy_filter_init(ngx_conf_t *cf);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	55
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	56
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	57 static ngx_http_module_t ngx_http_spdy_filter_module_ctx = {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	58 NULL, /* preconfiguration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	59 ngx_http_spdy_filter_init, /* postconfiguration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	60
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	61 NULL, /* create main configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	62 NULL, /* init main configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	63
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	64 NULL, /* create server configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	65 NULL, /* merge server configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	66
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	67 NULL, /* create location configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	68 NULL /* merge location configuration */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	69 };
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	70
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	71
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	72 ngx_module_t ngx_http_spdy_filter_module = {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	73 NGX_MODULE_V1,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	74 &ngx_http_spdy_filter_module_ctx, /* module context */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	75 NULL, /* module directives */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	76 NGX_HTTP_MODULE, /* module type */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	77 NULL, /* init master */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	78 NULL, /* init module */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	79 NULL, /* init process */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	80 NULL, /* init thread */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	81 NULL, /* exit thread */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	82 NULL, /* exit process */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	83 NULL, /* exit master */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	84 NGX_MODULE_V1_PADDING
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	85 };
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	86
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	87
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	88 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	89
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	90
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	91 static ngx_int_t
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	92 ngx_http_spdy_header_filter(ngx_http_request_t *r)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	93 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	94 int rc;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	95 size_t len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	96 u_char p, buf, *last;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	97 ngx_buf_t *b;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	98 ngx_str_t host;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	99 ngx_uint_t i, j, count, port;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	100 ngx_chain_t *cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	101 ngx_list_part_t part, pt;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	102 ngx_table_elt_t header, h;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	103 ngx_connection_t *c;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	104 ngx_http_cleanup_t *cln;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	105 ngx_http_core_loc_conf_t *clcf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	106 ngx_http_core_srv_conf_t *cscf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	107 ngx_http_spdy_stream_t *stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	108 ngx_http_spdy_out_frame_t *frame;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	109 ngx_http_spdy_connection_t *sc;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	110 struct sockaddr_in *sin;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	111 #if (NGX_HAVE_INET6)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	112 struct sockaddr_in6 *sin6;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	113 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	114 u_char addr[NGX_SOCKADDR_STRLEN];
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	115
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	116 if (!r->spdy_stream) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	117 return ngx_http_next_header_filter(r);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	118 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	119
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	120 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	121 "spdy header filter");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	122
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	123 if (r->header_sent) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	124 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	125 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	126
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	127 r->header_sent = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	128
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	129 if (r != r->main) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	130 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	131 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	132
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	133 c = r->connection;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	134
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	135 if (r->method == NGX_HTTP_HEAD) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	136 r->header_only = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	137 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	138
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	139 switch (r->headers_out.status) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	140
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	141 case NGX_HTTP_OK:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	142 case NGX_HTTP_PARTIAL_CONTENT:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	143 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	144
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	145 case NGX_HTTP_NOT_MODIFIED:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	146 r->header_only = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	147 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	148
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	149 case NGX_HTTP_NO_CONTENT:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	150 r->header_only = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	151
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	152 ngx_str_null(&r->headers_out.content_type);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	153
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	154 r->headers_out.content_length = NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	155 r->headers_out.content_length_n = -1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	156
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	157 /* fall through */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	158
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	159 default:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	160 r->headers_out.last_modified_time = -1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	161 r->headers_out.last_modified = NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	162 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	163
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	164 len = NGX_SPDY_NV_NUM_SIZE
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	165 + ngx_http_spdy_nv_nsize("version")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	166 + ngx_http_spdy_nv_vsize("HTTP/1.1")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	167 + ngx_http_spdy_nv_nsize("status")
5249 725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	168 + (r->headers_out.status_line.len
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	169 ? NGX_SPDY_NV_VLEN_SIZE + r->headers_out.status_line.len
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	170 : ngx_http_spdy_nv_vsize("418"));
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	171
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	172 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	173
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	174 if (r->headers_out.server == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	175 len += ngx_http_spdy_nv_nsize("server");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	176 len += clcf->server_tokens ? ngx_http_spdy_nv_vsize(NGINX_VER)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	177 : ngx_http_spdy_nv_vsize("nginx");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	178 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	179
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	180 if (r->headers_out.date == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	181 len += ngx_http_spdy_nv_nsize("date")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	182 + ngx_http_spdy_nv_vsize("Wed, 31 Dec 1986 10:00:00 GMT");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	183 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	184
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	185 if (r->headers_out.content_type.len) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	186 len += ngx_http_spdy_nv_nsize("content-type")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	187 + NGX_SPDY_NV_VLEN_SIZE + r->headers_out.content_type.len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	188
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	189 if (r->headers_out.content_type_len == r->headers_out.content_type.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	190 && r->headers_out.charset.len)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	191 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	192 len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	193 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	194 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	195
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	196 if (r->headers_out.content_length == NULL
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	197 && r->headers_out.content_length_n >= 0)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	198 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	199 len += ngx_http_spdy_nv_nsize("content-length")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	200 + NGX_SPDY_NV_VLEN_SIZE + NGX_OFF_T_LEN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	201 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	202
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	203 if (r->headers_out.last_modified == NULL
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	204 && r->headers_out.last_modified_time != -1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	205 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	206 len += ngx_http_spdy_nv_nsize("last-modified")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	207 + ngx_http_spdy_nv_vsize("Wed, 31 Dec 1986 10:00:00 GMT");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	208 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	209
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	210 if (r->headers_out.location
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	211 && r->headers_out.location->value.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	212 && r->headers_out.location->value.data[0] == '/')
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	213 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	214 r->headers_out.location->hash = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	215
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	216 if (clcf->server_name_in_redirect) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	217 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	218 host = cscf->server_name;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	219
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	220 } else if (r->headers_in.server.len) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	221 host = r->headers_in.server;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	222
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	223 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	224 host.len = NGX_SOCKADDR_STRLEN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	225 host.data = addr;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	226
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	227 if (ngx_connection_local_sockaddr(c, &host, 0) != NGX_OK) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	228 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	229 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	230 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	231
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	232 switch (c->local_sockaddr->sa_family) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	233
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	234 #if (NGX_HAVE_INET6)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	235 case AF_INET6:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	236 sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	237 port = ntohs(sin6->sin6_port);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	238 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	239 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	240 #if (NGX_HAVE_UNIX_DOMAIN)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	241 case AF_UNIX:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	242 port = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	243 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	244 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	245 default: /* AF_INET */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	246 sin = (struct sockaddr_in *) c->local_sockaddr;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	247 port = ntohs(sin->sin_port);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	248 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	249 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	250
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	251 len += ngx_http_spdy_nv_nsize("location")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	252 + ngx_http_spdy_nv_vsize("https://")
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	253 + host.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	254 + r->headers_out.location->value.len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	255
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	256 if (clcf->port_in_redirect) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	257
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	258 #if (NGX_HTTP_SSL)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	259 if (c->ssl)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	260 port = (port == 443) ? 0 : port;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	261 else
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	262 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	263 port = (port == 80) ? 0 : port;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	264
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	265 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	266 port = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	267 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	268
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	269 if (port) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	270 len += sizeof(":65535") - 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	271 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	272
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	273 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	274 ngx_str_null(&host);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	275 port = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	276 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	277
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	278 part = &r->headers_out.headers.part;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	279 header = part->elts;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	280
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	281 for (i = 0; /* void */; i++) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	282
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	283 if (i >= part->nelts) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	284 if (part->next == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	285 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	286 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	287
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	288 part = part->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	289 header = part->elts;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	290 i = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	291 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	292
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	293 if (header[i].hash == 0) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	294 continue;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	295 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	296
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	297 len += NGX_SPDY_NV_NLEN_SIZE + header[i].key.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	298 + NGX_SPDY_NV_VLEN_SIZE + header[i].value.len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	299 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	300
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	301 buf = ngx_alloc(len, r->pool->log);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	302 if (buf == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	303 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	304 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	305
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	306 last = buf + NGX_SPDY_NV_NUM_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	307
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	308 last = ngx_http_spdy_nv_write_name(last, "version");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	309 last = ngx_http_spdy_nv_write_val(last, "HTTP/1.1");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	310
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	311 last = ngx_http_spdy_nv_write_name(last, "status");
5249 725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	312
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	313 if (r->headers_out.status_line.len) {
5251 4ef49081ef4c SPDY: fixed code style, no functional changes. Valentin Bartenev <vbart@nginx.com> parents: 5249 diff changeset	314 last = ngx_http_spdy_nv_write_vlen(last,
4ef49081ef4c SPDY: fixed code style, no functional changes. Valentin Bartenev <vbart@nginx.com> parents: 5249 diff changeset	315 r->headers_out.status_line.len);
5249 725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	316 last = ngx_cpymem(last, r->headers_out.status_line.data,
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	317 r->headers_out.status_line.len);
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	318 } else {
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	319 last = ngx_http_spdy_nv_write_vlen(last, 3);
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	320 last = ngx_sprintf(last, "%03ui", r->headers_out.status);
725fb71ab1a6 SPDY: pass through the full status when available. Jim Radford <radford@galvanix.com> parents: 5242 diff changeset	321 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	322
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	323 count = 2;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	324
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	325 if (r->headers_out.server == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	326 last = ngx_http_spdy_nv_write_name(last, "server");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	327 last = clcf->server_tokens
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	328 ? ngx_http_spdy_nv_write_val(last, NGINX_VER)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	329 : ngx_http_spdy_nv_write_val(last, "nginx");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	330
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	331 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	332 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	333
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	334 if (r->headers_out.date == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	335 last = ngx_http_spdy_nv_write_name(last, "date");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	336
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	337 last = ngx_http_spdy_nv_write_vlen(last, ngx_cached_http_time.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	338
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	339 last = ngx_cpymem(last, ngx_cached_http_time.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	340 ngx_cached_http_time.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	341
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	342 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	343 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	344
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	345 if (r->headers_out.content_type.len) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	346
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	347 last = ngx_http_spdy_nv_write_name(last, "content-type");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	348
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	349 p = last + NGX_SPDY_NV_VLEN_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	350
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	351 last = ngx_cpymem(p, r->headers_out.content_type.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	352 r->headers_out.content_type.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	353
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	354 if (r->headers_out.content_type_len == r->headers_out.content_type.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	355 && r->headers_out.charset.len)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	356 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	357 last = ngx_cpymem(last, "; charset=", sizeof("; charset=") - 1);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	358
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	359 last = ngx_cpymem(last, r->headers_out.charset.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	360 r->headers_out.charset.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	361
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	362 /* update r->headers_out.content_type for possible logging */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	363
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	364 r->headers_out.content_type.len = last - p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	365 r->headers_out.content_type.data = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	366 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	367
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	368 (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	369 r->headers_out.content_type.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	370
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	371 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	372 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	373
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	374 if (r->headers_out.content_length == NULL
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	375 && r->headers_out.content_length_n >= 0)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	376 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	377 last = ngx_http_spdy_nv_write_name(last, "content-length");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	378
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	379 p = last + NGX_SPDY_NV_VLEN_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	380
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	381 last = ngx_sprintf(p, "%O", r->headers_out.content_length_n);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	382
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	383 (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	384 last - p);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	385
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	386 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	387 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	388
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	389 if (r->headers_out.last_modified == NULL
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	390 && r->headers_out.last_modified_time != -1)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	391 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	392 last = ngx_http_spdy_nv_write_name(last, "last-modified");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	393
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	394 p = last + NGX_SPDY_NV_VLEN_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	395
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	396 last = ngx_http_time(p, r->headers_out.last_modified_time);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	397
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	398 (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	399 last - p);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	400
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	401 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	402 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	403
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	404 if (host.data) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	405
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	406 last = ngx_http_spdy_nv_write_name(last, "location");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	407
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	408 p = last + NGX_SPDY_NV_VLEN_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	409
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	410 last = ngx_cpymem(p, "http", sizeof("http") - 1);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	411
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	412 #if (NGX_HTTP_SSL)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	413 if (c->ssl) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	414 *last++ ='s';
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	415 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	416 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	417
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	418 last++ = ':'; last++ = '/'; *last++ = '/';
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	419
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	420 last = ngx_cpymem(last, host.data, host.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	421
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	422 if (port) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	423 last = ngx_sprintf(last, ":%ui", port);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	424 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	425
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	426 last = ngx_cpymem(last, r->headers_out.location->value.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	427 r->headers_out.location->value.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	428
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	429 /* update r->headers_out.location->value for possible logging */
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	430
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	431 r->headers_out.location->value.len = last - p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	432 r->headers_out.location->value.data = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	433 ngx_str_set(&r->headers_out.location->key, "location");
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	434
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	435 (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	436 r->headers_out.location->value.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	437
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	438 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	439 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	440
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	441 part = &r->headers_out.headers.part;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	442 header = part->elts;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	443
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	444 for (i = 0; /* void */; i++) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	445
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	446 if (i >= part->nelts) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	447 if (part->next == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	448 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	449 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	450
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	451 part = part->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	452 header = part->elts;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	453 i = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	454 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	455
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	456 if (header[i].hash == 0 \|\| header[i].hash == 2) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	457 continue;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	458 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	459
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	460 if ((header[i].key.len == 6
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	461 && ngx_strncasecmp(header[i].key.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	462 (u_char *) "status", 6) == 0)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	463 \|\| (header[i].key.len == 7
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	464 && ngx_strncasecmp(header[i].key.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	465 (u_char *) "version", 7) == 0))
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	466 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	467 header[i].hash = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	468 continue;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	469 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	470
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	471 last = ngx_http_spdy_nv_write_nlen(last, header[i].key.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	472
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	473 ngx_strlow(last, header[i].key.data, header[i].key.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	474 last += header[i].key.len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	475
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	476 p = last + NGX_SPDY_NV_VLEN_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	477
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	478 last = ngx_cpymem(p, header[i].value.data, header[i].value.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	479
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	480 pt = part;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	481 h = header;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	482
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	483 for (j = i + 1; /* void */; j++) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	484
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	485 if (j >= pt->nelts) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	486 if (pt->next == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	487 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	488 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	489
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	490 pt = pt->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	491 h = pt->elts;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	492 j = 0;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	493 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	494
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	495 if (h[j].hash == 0 \|\| h[j].hash == 2
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	496 \|\| h[j].key.len != header[i].key.len
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	497 \|\| ngx_strncasecmp(header[i].key.data, h[j].key.data,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	498 header[i].key.len))
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	499 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	500 continue;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	501 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	502
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	503 *last++ = '\0';
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	504
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	505 last = ngx_cpymem(last, h[j].value.data, h[j].value.len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	506
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	507 h[j].hash = 2;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	508 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	509
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	510 (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	511 last - p);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	512
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	513 count++;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	514 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	515
5242 5776804fff04 SPDY: use proper macros for value length and headers counter. Valentin Bartenev <vbart@nginx.com> parents: 5121 diff changeset	516 (void) ngx_http_spdy_nv_write_num(buf, count);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	517
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	518 stream = r->spdy_stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	519 sc = stream->connection;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	520
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	521 len = last - buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	522
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	523 b = ngx_create_temp_buf(r->pool, NGX_SPDY_FRAME_HEADER_SIZE
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	524 + NGX_SPDY_SYN_REPLY_SIZE
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	525 + deflateBound(&sc->zstream_out, len));
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	526 if (b == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	527 ngx_free(buf);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	528 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	529 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	530
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	531 b->last += NGX_SPDY_FRAME_HEADER_SIZE + NGX_SPDY_SYN_REPLY_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	532
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	533 sc->zstream_out.next_in = buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	534 sc->zstream_out.avail_in = len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	535 sc->zstream_out.next_out = b->last;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	536 sc->zstream_out.avail_out = b->end - b->last;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	537
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	538 rc = deflate(&sc->zstream_out, Z_SYNC_FLUSH);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	539
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	540 ngx_free(buf);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	541
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	542 if (rc != Z_OK) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	543 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	544 "spdy deflate() failed: %d", rc);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	545 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	546 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	547
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	548 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	549 "spdy deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	550 sc->zstream_out.next_in, sc->zstream_out.next_out,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	551 sc->zstream_out.avail_in, sc->zstream_out.avail_out,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	552 rc);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	553
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	554 b->last = sc->zstream_out.next_out;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	555
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	556 p = b->pos;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	557 p = ngx_spdy_frame_write_head(p, NGX_SPDY_SYN_REPLY);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	558
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	559 len = b->last - b->pos;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	560
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	561 r->header_size = len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	562
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	563 if (r->header_only) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	564 b->last_buf = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	565 p = ngx_spdy_frame_write_flags_and_len(p, NGX_SPDY_FLAG_FIN,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	566 len - NGX_SPDY_FRAME_HEADER_SIZE);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	567 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	568 p = ngx_spdy_frame_write_flags_and_len(p, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	569 len - NGX_SPDY_FRAME_HEADER_SIZE);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	570 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	571
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	572 (void) ngx_spdy_frame_write_sid(p, stream->id);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	573
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	574 cl = ngx_alloc_chain_link(r->pool);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	575 if (cl == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	576 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	577 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	578
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	579 cl->buf = b;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	580 cl->next = NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	581
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	582 frame = ngx_palloc(r->pool, sizeof(ngx_http_spdy_out_frame_t));
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	583 if (frame == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	584 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	585 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	586
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	587 frame->first = cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	588 frame->last = cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	589 frame->handler = ngx_http_spdy_syn_frame_handler;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	590 frame->free = NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	591 frame->stream = stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	592 frame->size = len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	593 frame->priority = stream->priority;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	594 frame->blocked = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	595 frame->fin = r->header_only;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	596
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	597 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	598 "spdy:%ui create SYN_REPLY frame %p: size:%uz",
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	599 stream->id, frame, frame->size);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	600
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	601 ngx_http_spdy_queue_blocked_frame(sc, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	602
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	603 cln = ngx_http_cleanup_add(r, 0);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	604 if (cln == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	605 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	606 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	607
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	608 cln->handler = ngx_http_spdy_filter_cleanup;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	609 cln->data = stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	610
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	611 stream->queued = 1;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	612
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	613 c->send_chain = ngx_http_spdy_send_chain;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	614 c->need_last_buf = 1;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	615
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	616 return ngx_http_spdy_filter_send(c, stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	617 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	618
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	619
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	620 static ngx_chain_t *
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	621 ngx_http_spdy_send_chain(ngx_connection_t fc, ngx_chain_t in, off_t limit)
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	622 {
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	623 off_t size, offset;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	624 size_t rest, frame_size;
5494 27f9d5f68c1c SPDY: refactored loop in ngx_http_spdy_body_filter(). Valentin Bartenev <vbart@nginx.com> parents: 5493 diff changeset	625 ngx_chain_t cl, out, **ln;
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	626 ngx_http_request_t *r;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	627 ngx_http_spdy_stream_t *stream;
5515 e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	628 ngx_http_spdy_loc_conf_t *slcf;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	629 ngx_http_spdy_out_frame_t *frame;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	630
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	631 r = fc->data;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	632 stream = r->spdy_stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	633
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	634 if (in == NULL) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	635
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	636 if (stream->queued) {
5512 9fffc0c46e5c SPDY: fixed possible premature close of stream. Valentin Bartenev <vbart@nginx.com> parents: 5511 diff changeset	637 fc->write->delayed = 1;
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	638 } else {
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	639 fc->buffered &= ~NGX_SPDY_BUFFERED;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	640 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	641
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	642 return NULL;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	643 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	644
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	645 size = ngx_buf_size(in->buf);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	646
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	647 if (in->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	648 cl = ngx_alloc_chain_link(r->pool);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	649 if (cl == NULL) {
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	650 return NGX_CHAIN_ERROR;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	651 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	652
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	653 cl->buf = in->buf;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	654 in->buf = cl->buf->shadow;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	655
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	656 offset = ngx_buf_in_memory(in->buf)
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	657 ? (cl->buf->pos - in->buf->pos)
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	658 : (cl->buf->file_pos - in->buf->file_pos);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	659
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	660 cl->next = stream->free_bufs;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	661 stream->free_bufs = cl;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	662
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	663 } else {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	664 offset = 0;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	665 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	666
5516 439d05a037a3 SPDY: fixed build, broken by b7ee1bae0ffa. Valentin Bartenev <vbart@nginx.com> parents: 5515 diff changeset	667 #if (NGX_SUPPRESS_WARN)
439d05a037a3 SPDY: fixed build, broken by b7ee1bae0ffa. Valentin Bartenev <vbart@nginx.com> parents: 5515 diff changeset	668 cl = NULL;
439d05a037a3 SPDY: fixed build, broken by b7ee1bae0ffa. Valentin Bartenev <vbart@nginx.com> parents: 5515 diff changeset	669 #endif
439d05a037a3 SPDY: fixed build, broken by b7ee1bae0ffa. Valentin Bartenev <vbart@nginx.com> parents: 5515 diff changeset	670
5515 e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	671 slcf = ngx_http_get_module_loc_conf(r, ngx_http_spdy_module);
e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	672
e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	673 frame_size = (limit && limit <= (off_t) slcf->chunk_size)
e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	674 ? (size_t) limit
e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	675 : slcf->chunk_size;
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	676
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	677 for ( ;; ) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	678 ln = &out;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	679 rest = frame_size;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	680
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	681 while ((off_t) rest >= size) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	682
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	683 if (offset) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	684 cl = ngx_http_spdy_filter_get_shadow(stream, in->buf,
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	685 offset, size);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	686 if (cl == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	687 return NGX_CHAIN_ERROR;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	688 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	689
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	690 offset = 0;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	691
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	692 } else {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	693 cl = ngx_alloc_chain_link(r->pool);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	694 if (cl == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	695 return NGX_CHAIN_ERROR;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	696 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	697
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	698 cl->buf = in->buf;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	699 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	700
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	701 *ln = cl;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	702 ln = &cl->next;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	703
5517 9d1479234f3c SPDY: fixed off_t/size_t type conversions on 32 bits platforms. Valentin Bartenev <vbart@nginx.com> parents: 5516 diff changeset	704 rest -= (size_t) size;
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	705 in = in->next;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	706
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	707 if (in == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	708 frame_size -= rest;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	709 rest = 0;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	710 break;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	711 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	712
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	713 size = ngx_buf_size(in->buf);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	714 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	715
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	716 if (rest) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	717 cl = ngx_http_spdy_filter_get_shadow(stream, in->buf,
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	718 offset, rest);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	719 if (cl == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	720 return NGX_CHAIN_ERROR;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	721 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	722
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	723 cl->buf->flush = 0;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	724 cl->buf->last_buf = 0;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	725
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	726 *ln = cl;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	727
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	728 offset += rest;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	729 size -= rest;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	730 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	731
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	732 frame = ngx_http_spdy_filter_get_data_frame(stream, frame_size,
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	733 out, cl);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	734 if (frame == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	735 return NGX_CHAIN_ERROR;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	736 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	737
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	738 ngx_http_spdy_queue_frame(stream->connection, frame);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	739
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	740 stream->queued++;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	741
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	742 if (in == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	743 break;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	744 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	745
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	746 if (limit) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	747 limit -= frame_size;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	748
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	749 if (limit == 0) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	750 break;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	751 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	752
5515 e5fb14e85040 SPDY: added the "spdy_chunk_size" directive. Valentin Bartenev <vbart@nginx.com> parents: 5514 diff changeset	753 if (limit < (off_t) slcf->chunk_size) {
5517 9d1479234f3c SPDY: fixed off_t/size_t type conversions on 32 bits platforms. Valentin Bartenev <vbart@nginx.com> parents: 5516 diff changeset	754 frame_size = (size_t) limit;
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	755 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	756 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	757 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	758
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	759 if (offset) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	760 cl = ngx_http_spdy_filter_get_shadow(stream, in->buf, offset, size);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	761 if (cl == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	762 return NGX_CHAIN_ERROR;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	763 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	764
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	765 in->buf = cl->buf;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	766 ngx_free_chain(r->pool, cl);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	767 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	768
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	769 if (ngx_http_spdy_filter_send(fc, stream) == NGX_ERROR) {
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	770 return NGX_CHAIN_ERROR;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	771 }
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	772
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	773 return in;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	774 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	775
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	776
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	777 static ngx_chain_t *
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	778 ngx_http_spdy_filter_get_shadow(ngx_http_spdy_stream_t stream, ngx_buf_t buf,
5517 9d1479234f3c SPDY: fixed off_t/size_t type conversions on 32 bits platforms. Valentin Bartenev <vbart@nginx.com> parents: 5516 diff changeset	779 off_t offset, off_t size)
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	780 {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	781 ngx_buf_t *chunk;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	782 ngx_chain_t *cl;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	783
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	784 cl = ngx_chain_get_free_buf(stream->request->pool, &stream->free_bufs);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	785 if (cl == NULL) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	786 return NULL;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	787 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	788
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	789 chunk = cl->buf;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	790
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	791 ngx_memcpy(chunk, buf, sizeof(ngx_buf_t));
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	792
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	793 chunk->tag = (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	794 chunk->shadow = buf;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	795
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	796 if (ngx_buf_in_memory(chunk)) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	797 chunk->pos += offset;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	798 chunk->last = chunk->pos + size;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	799 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	800
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	801 if (chunk->in_file) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	802 chunk->file_pos += offset;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	803 chunk->file_last = chunk->file_pos + size;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	804 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	805
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	806 return cl;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	807 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	808
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	809
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	810 static ngx_http_spdy_out_frame_t *
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	811 ngx_http_spdy_filter_get_data_frame(ngx_http_spdy_stream_t *stream,
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	812 size_t len, ngx_chain_t first, ngx_chain_t last)
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	813 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	814 u_char *p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	815 ngx_buf_t *buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	816 ngx_uint_t flags;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	817 ngx_chain_t *cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	818 ngx_http_spdy_out_frame_t *frame;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	819
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	820
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	821 frame = stream->free_frames;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	822
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	823 if (frame) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	824 stream->free_frames = frame->free;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	825
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	826 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	827 frame = ngx_palloc(stream->request->pool,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	828 sizeof(ngx_http_spdy_out_frame_t));
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	829 if (frame == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	830 return NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	831 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	832 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	833
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	834 flags = last->buf->last_buf ? NGX_SPDY_FLAG_FIN : 0;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	835
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	836 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	837 "spdy:%ui create DATA frame %p: len:%uz flags:%ui",
97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	838 stream->id, frame, len, flags);
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	839
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	840 if (len \|\| flags) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	841
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	842 cl = ngx_chain_get_free_buf(stream->request->pool,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	843 &stream->free_data_headers);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	844 if (cl == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	845 return NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	846 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	847
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	848 buf = cl->buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	849
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	850 if (buf->start) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	851 p = buf->start;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	852 buf->pos = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	853
5483 86b563036d5a SPDY: use predefined constant for size of the Stream-ID field. Valentin Bartenev <vbart@nginx.com> parents: 5251 diff changeset	854 p += NGX_SPDY_SID_SIZE;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	855
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	856 (void) ngx_spdy_frame_write_flags_and_len(p, flags, len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	857
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	858 } else {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	859 p = ngx_palloc(stream->request->pool, NGX_SPDY_FRAME_HEADER_SIZE);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	860 if (p == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	861 return NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	862 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	863
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	864 buf->pos = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	865 buf->start = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	866
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	867 p = ngx_spdy_frame_write_sid(p, stream->id);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	868 p = ngx_spdy_frame_write_flags_and_len(p, flags, len);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	869
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	870 buf->last = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	871 buf->end = p;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	872
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	873 buf->tag = (ngx_buf_tag_t) &ngx_http_spdy_filter_get_data_frame;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	874 buf->memory = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	875 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	876
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	877 cl->next = first;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	878 first = cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	879 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	880
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	881 frame->first = first;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	882 frame->last = last;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	883 frame->handler = ngx_http_spdy_data_frame_handler;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	884 frame->free = NULL;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	885 frame->stream = stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	886 frame->size = NGX_SPDY_FRAME_HEADER_SIZE + len;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	887 frame->priority = stream->priority;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	888 frame->blocked = 0;
5495 97f6cd787766 SPDY: a bit smarter ngx_http_spdy_filter_get_data_frame(). Valentin Bartenev <vbart@nginx.com> parents: 5494 diff changeset	889 frame->fin = last->buf->last_buf;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	890
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	891 return frame;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	892 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	893
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	894
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	895 static ngx_inline ngx_int_t
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	896 ngx_http_spdy_filter_send(ngx_connection_t fc, ngx_http_spdy_stream_t stream)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	897 {
5493 916cb6d28f6a SPDY: fixed possible request hang. Valentin Bartenev <vbart@nginx.com> parents: 5483 diff changeset	898 stream->blocked = 1;
916cb6d28f6a SPDY: fixed possible request hang. Valentin Bartenev <vbart@nginx.com> parents: 5483 diff changeset	899
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	900 if (ngx_http_spdy_send_output_queue(stream->connection) == NGX_ERROR) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	901 fc->error = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	902 return NGX_ERROR;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	903 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	904
5493 916cb6d28f6a SPDY: fixed possible request hang. Valentin Bartenev <vbart@nginx.com> parents: 5483 diff changeset	905 stream->blocked = 0;
916cb6d28f6a SPDY: fixed possible request hang. Valentin Bartenev <vbart@nginx.com> parents: 5483 diff changeset	906
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	907 if (stream->queued) {
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	908 fc->buffered \|= NGX_SPDY_BUFFERED;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	909 fc->write->delayed = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	910 return NGX_AGAIN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	911 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	912
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	913 fc->buffered &= ~NGX_SPDY_BUFFERED;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	914
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	915 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	916 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	917
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	918
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	919 static ngx_int_t
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	920 ngx_http_spdy_syn_frame_handler(ngx_http_spdy_connection_t *sc,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	921 ngx_http_spdy_out_frame_t *frame)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	922 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	923 ngx_buf_t *buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	924 ngx_http_spdy_stream_t *stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	925
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	926 buf = frame->first->buf;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	927
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	928 if (buf->pos != buf->last) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	929 return NGX_AGAIN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	930 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	931
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	932 stream = frame->stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	933
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	934 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	935 "spdy:%ui SYN_REPLY frame %p was sent", stream->id, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	936
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	937 ngx_free_chain(stream->request->pool, frame->first);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	938
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	939 ngx_http_spdy_handle_frame(stream, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	940
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	941 ngx_http_spdy_handle_stream(sc, stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	942
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	943 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	944 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	945
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	946
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	947 static ngx_int_t
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	948 ngx_http_spdy_data_frame_handler(ngx_http_spdy_connection_t *sc,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	949 ngx_http_spdy_out_frame_t *frame)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	950 {
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	951 ngx_buf_t *buf;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	952 ngx_chain_t cl, ln;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	953 ngx_http_spdy_stream_t *stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	954
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	955 stream = frame->stream;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	956
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	957 cl = frame->first;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	958
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	959 if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_data_frame) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	960
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	961 if (cl->buf->pos != cl->buf->last) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	962 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	963 "spdy:%ui DATA frame %p was sent partially",
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	964 stream->id, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	965
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	966 return NGX_AGAIN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	967 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	968
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	969 ln = cl->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	970
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	971 cl->next = stream->free_data_headers;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	972 stream->free_data_headers = cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	973
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	974 if (cl == frame->last) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	975 goto done;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	976 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	977
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	978 cl = ln;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	979 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	980
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	981 for ( ;; ) {
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	982 if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	983 buf = cl->buf->shadow;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	984
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	985 if (ngx_buf_in_memory(buf)) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	986 buf->pos = cl->buf->pos;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	987 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	988
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	989 if (buf->in_file) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	990 buf->file_pos = cl->buf->file_pos;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	991 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	992 }
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	993
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	994 if (ngx_buf_size(cl->buf) != 0) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	995
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	996 if (cl != frame->first) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	997 frame->first = cl;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	998 ngx_http_spdy_handle_stream(sc, stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	999 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1000
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1001 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1002 "spdy:%ui DATA frame %p was sent partially",
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1003 stream->id, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1004
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1005 return NGX_AGAIN;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1006 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1007
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1008 ln = cl->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1009
5514 b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1010 if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1011 cl->next = stream->free_bufs;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1012 stream->free_bufs = cl;
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1013
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1014 } else {
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1015 ngx_free_chain(stream->request->pool, cl);
b7ee1bae0ffa SPDY: implemented buffers chain splitting. Valentin Bartenev <vbart@nginx.com> parents: 5513 diff changeset	1016 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1017
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1018 if (cl == frame->last) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1019 goto done;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1020 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1021
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1022 cl = ln;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1023 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1024
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1025 done:
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1026
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1027 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1028 "spdy:%ui DATA frame %p was sent", stream->id, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1029
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1030 stream->request->header_size += NGX_SPDY_FRAME_HEADER_SIZE;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1031
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1032 ngx_http_spdy_handle_frame(stream, frame);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1033
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1034 ngx_http_spdy_handle_stream(sc, stream);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1035
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1036 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1037 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1038
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1039
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1040 static ngx_inline void
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1041 ngx_http_spdy_handle_frame(ngx_http_spdy_stream_t *stream,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1042 ngx_http_spdy_out_frame_t *frame)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1043 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1044 ngx_http_request_t *r;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1045
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1046 r = stream->request;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1047
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1048 r->connection->sent += frame->size;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1049
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1050 if (frame->fin) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1051 stream->out_closed = 1;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1052 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1053
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1054 frame->free = stream->free_frames;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1055 stream->free_frames = frame;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1056
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	1057 stream->queued--;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1058 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1059
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1060
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1061 static ngx_inline void
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1062 ngx_http_spdy_handle_stream(ngx_http_spdy_connection_t *sc,
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1063 ngx_http_spdy_stream_t *stream)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1064 {
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1065 ngx_event_t *wev;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1066
5493 916cb6d28f6a SPDY: fixed possible request hang. Valentin Bartenev <vbart@nginx.com> parents: 5483 diff changeset	1067 if (stream->handled \|\| stream->blocked) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1068 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1069 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1070
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1071 wev = stream->request->connection->write;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1072
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1073 if (!wev->timer_set) {
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1074 wev->delayed = 0;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1075
5513 311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1076 stream->handled = 1;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1077
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1078 stream->next = sc->last_stream;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1079 sc->last_stream = stream;
311803b21504 SPDY: body filter was replaced by c->send_chain() function. Valentin Bartenev <vbart@nginx.com> parents: 5512 diff changeset	1080 }
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1081 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1082
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1083
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1084 static void
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1085 ngx_http_spdy_filter_cleanup(void *data)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1086 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1087 ngx_http_spdy_stream_t *stream = data;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1088
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1089 ngx_http_spdy_out_frame_t frame, *fn;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1090
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	1091 if (stream->queued == 0) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1092 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1093 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1094
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1095 fn = &stream->connection->last_out;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1096
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1097 for ( ;; ) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1098 frame = *fn;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1099
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1100 if (frame == NULL) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1101 break;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1102 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1103
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1104 if (frame->stream == stream && !frame->blocked) {
5508 9053fdcea4b7 SPDY: better name for queued frames counter. Valentin Bartenev <vbart@nginx.com> parents: 5495 diff changeset	1105 stream->queued--;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1106
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1107 *fn = frame->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1108 continue;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1109 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1110
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1111 fn = &frame->next;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1112 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1113 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1114
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1115
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1116 static ngx_int_t
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1117 ngx_http_spdy_filter_init(ngx_conf_t *cf)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1118 {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1119 ngx_http_next_header_filter = ngx_http_top_header_filter;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1120 ngx_http_top_header_filter = ngx_http_spdy_header_filter;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1121
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1122 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: diff changeset	1123 }

Mercurial > hg > nginx

annotate src/http/ngx_http_spdy_filter_module.c @ 5517:9d1479234f3c