nginx: src/http/v2/ngx_http

comparison src/http/v2/ngx_http_v2.c @ 7207:3d2b0b02bd3d

HTTP/2: push additional request headers (closes #1478). The Accept-Encoding, Accept-Language, and User-Agent header fields are now copied from the original request to pushed requests.

author	Ruslan Ermilov <ru@nginx.com>
date	Thu, 15 Feb 2018 17:51:32 +0300
parents	e44c297a6b95
children	affeb6ef732c

comparison

equal deleted inserted replaced

-:33edea74bd58
+:3d2b0b02bd3d
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
 #include <ngx_http_v2_module.h>
+typedef struct {
+ngx_str_t           name;
+ngx_uint_t          offset;
+ngx_uint_t          hash;
+ngx_http_header_t  *hh;
+} ngx_http_v2_parse_header_t;
 /* errors */
 #define NGX_HTTP_V2_NO_ERROR                     0x0
 #define NGX_HTTP_V2_PROTOCOL_ERROR               0x1
 ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_scheme(ngx_http_request_t *r,
 ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_authority(ngx_http_request_t *r,
 ngx_str_t *value);
+static ngx_int_t ngx_http_v2_parse_header(ngx_http_request_t *r,
+ngx_http_v2_parse_header_t *header, ngx_str_t *value);
 static ngx_int_t ngx_http_v2_construct_request_line(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
 ngx_http_v2_header_t *header);
 static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
 #define NGX_HTTP_V2_FRAME_STATES                                              \
 (sizeof(ngx_http_v2_frame_states) / sizeof(ngx_http_v2_handler_pt))
+static ngx_http_v2_parse_header_t  ngx_http_v2_parse_headers[] = {
+{ ngx_string("host"),
+offsetof(ngx_http_headers_in_t, host), 0, NULL },
+{ ngx_string("accept-encoding"),
+offsetof(ngx_http_headers_in_t, accept_encoding), 0, NULL },
+{ ngx_string("accept-language"),
+offsetof(ngx_http_headers_in_t, accept_language), 0, NULL },
+{ ngx_string("user-agent"),
+offsetof(ngx_http_headers_in_t, user_agent), 0, NULL },
+{ ngx_null_string, 0, 0, NULL }
+};
 void
 ngx_http_v2_init(ngx_event_t *rev)
 {
 ngx_connection_t          *c;
 ngx_pool_cleanup_t        *cln;
 return NGX_AGAIN;
 }
-ngx_int_t
+ngx_http_v2_stream_t *
-ngx_http_v2_push_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t depend,
+ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent, ngx_str_t *path)
-size_t request_length, ngx_str_t *path, ngx_str_t *authority)
+{
-{
+ngx_int_t                     rc;
-ngx_int_t              rc;
+ngx_str_t                     value;
-ngx_str_t              value;
+ngx_table_elt_t             **h;
-ngx_connection_t      *fc;
+ngx_connection_t             *fc;
-ngx_http_request_t    *r;
+ngx_http_request_t           *r;
-ngx_http_v2_node_t    *node;
+ngx_http_v2_node_t           *node;
-ngx_http_v2_stream_t  *stream;
+ngx_http_v2_stream_t         *stream;
+ngx_http_v2_connection_t     *h2c;
+ngx_http_v2_parse_header_t   *header;
+h2c = parent->connection;
 node = ngx_http_v2_get_node_by_id(h2c, h2c->last_push, 1);
 if (node == NULL) {
-return NGX_ERROR;
+return NULL;
 }
 if (node->parent) {
 ngx_queue_remove(&node->reuse);
 h2c->closed_nodes--;
 }
 stream = ngx_http_v2_create_stream(h2c, 1);
 if (stream == NULL) {
-return NGX_ERROR;
+return NULL;
 }
 stream->pool = ngx_create_pool(1024, h2c->connection->log);
 if (stream->pool == NULL) {
-return NGX_ERROR;
+return NULL;
 }
 r = stream->request;
 fc = r->connection;
-r->request_length = request_length;
 stream->in_closed = 1;
 stream->node = node;
 node->stream = stream;
 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
 "http2 push stream sid:%ui "
 "depends on %ui excl:0 weight:16",
-h2c->last_push, depend);
+h2c->last_push, parent->node->id);
 node->weight = NGX_HTTP_V2_DEFAULT_WEIGHT;
-ngx_http_v2_set_dependency(h2c, node, depend, 0);
+ngx_http_v2_set_dependency(h2c, node, parent->node->id, 0);
 r->method_name = ngx_http_core_get_method;
 r->method = NGX_HTTP_GET;
 r->schema_start = (u_char *) "https";
 #endif
 {
 r->schema_end = r->schema_start + 4;
 }
-value.len = authority->len;
+value.data = ngx_pstrdup(stream->pool, path);
-value.data = ngx_pstrdup(stream->pool, authority);
 if (value.data == NULL) {
-return NGX_ERROR;
+return NULL;
 }
-rc = ngx_http_v2_parse_authority(r, &value);
+value.len = path->len;
+rc = ngx_http_v2_parse_path(r, &value);
 if (rc != NGX_OK) {
 goto error;
 }
-value.len = path->len;
+for (header = ngx_http_v2_parse_headers; header->name.len; header++) {
+h = (ngx_table_elt_t **)
-value.data = ngx_pstrdup(stream->pool, path);
+((char *) &parent->request->headers_in + header->offset);
-if (value.data == NULL) {
-return NGX_ERROR;
+if (*h == NULL) {
-}
+continue;
+}
-rc = ngx_http_v2_parse_path(r, &value);
+value.len = (*h)->value.len;
-if (rc != NGX_OK) {
-goto error;
+value.data = ngx_pnalloc(stream->pool, value.len + 1);
+if (value.data == NULL) {
+return NULL;
+}
+ngx_memcpy(value.data, (*h)->value.data, value.len);
+value.data[value.len] = '\0';
+rc = ngx_http_v2_parse_header(r, header, &value);
+if (rc != NGX_OK) {
+goto error;
+}
 }
 fc->write->handler = ngx_http_v2_run_request_handler;
 ngx_post_event(fc->write, &ngx_posted_events);
-return NGX_OK;
+return stream;
 error:
 if (rc == NGX_ABORT) {
-return NGX_ERROR;
+/* header handler has already finalized request */
+return NULL;
 }
 if (rc == NGX_DECLINED) {
 ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-return NGX_ERROR;
+return NULL;
 }
 (void) ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-return NGX_ERROR;
+return NULL;
 }
 static ngx_int_t
 ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c)
 static ngx_int_t
 ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_str_t *value)
 {
+return ngx_http_v2_parse_header(r, &ngx_http_v2_parse_headers[0], value);
+}
+static ngx_int_t
+ngx_http_v2_parse_header(ngx_http_request_t *r,
+ngx_http_v2_parse_header_t *header, ngx_str_t *value)
+{
 ngx_table_elt_t            *h;
-ngx_http_header_t          *hh;
 ngx_http_core_main_conf_t  *cmcf;
-static ngx_str_t host = ngx_string("host");
 h = ngx_list_push(&r->headers_in.headers);
 if (h == NULL) {
 return NGX_ERROR;
 }
-h->hash = ngx_hash_key(host.data, host.len);
+h->key.len = header->name.len;
+h->key.data = header->name.data;
-h->key.len = host.len;
+h->lowcase_key = header->name.data;
-h->key.data = host.data;
+if (header->hh == NULL) {
+header->hash = ngx_hash_key(header->name.data, header->name.len);
+cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+header->hh = ngx_hash_find(&cmcf->headers_in_hash, header->hash,
+h->lowcase_key, h->key.len);
+if (header->hh == NULL) {
+return NGX_ERROR;
+}
+}
+h->hash = header->hash;
 h->value.len = value->len;
 h->value.data = value->data;
-h->lowcase_key = host.data;
+if (header->hh->handler(r, h, header->hh->offset) != NGX_OK) {
+/* header handler has already finalized request */
-cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
-h->lowcase_key, h->key.len);
-if (hh == NULL) {
-return NGX_ERROR;
-}
-if (hh->handler(r, h, hh->offset) != NGX_OK) {
-/*
-* request has been finalized already
-* in ngx_http_process_host()
-*/
 return NGX_ABORT;
 }
 return NGX_OK;
 }

Mercurial > hg > nginx

comparison src/http/v2/ngx_http_v2.c @ 7207:3d2b0b02bd3d