nginx: src/http/v2/ngx_http

comparison src/http/v2/ngx_http_v2.c @ 9121:262c01782566

HTTP/2: removed server push (ticket #2432). Although it has better implementation status than HTTP/3 server push, it remains of limited use, with adoption numbers seen as negligible. Per IETF 102 materials, server push was used only in 0.04% of sessions. It was considered to be "difficult to use effectively" in RFC 9113. Its use is further limited by badly matching to fetch/cache/connection models in browsers, see related discussions linked from [1]. Server push was disabled in Chrome 106 [2]. The http2_push, http2_push_preload, and http2_max_concurrent_pushes directives are made obsolete. In particular, this essentially reverts 7201:641306096f5b and 7207:3d2b0b02bd3d. [1] https://jakearchibald.com/2017/h2-push-tougher-than-i-thought/ [2] https://chromestatus.com/feature/6302414934114304

author	Sergey Kandaurov <pluknet@nginx.com>
date	Thu, 08 Jun 2023 16:56:46 +0400
parents	08ef02ad5c54
children	cdda286c0f1b

comparison

equal deleted inserted replaced

-:0aaa09927703
+:262c01782566
 #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
 static ngx_int_t ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c,
 u_char **pos, u_char *end, ngx_uint_t prefix);
 static ngx_http_v2_stream_t *ngx_http_v2_create_stream(
-ngx_http_v2_connection_t *h2c, ngx_uint_t push);
+ngx_http_v2_connection_t *h2c);
 static ngx_http_v2_node_t *ngx_http_v2_get_node_by_id(
 ngx_http_v2_connection_t *h2c, ngx_uint_t sid, ngx_uint_t alloc);
 static ngx_http_v2_node_t *ngx_http_v2_get_closed_node(
 ngx_http_v2_connection_t *h2c);
 #define ngx_http_v2_index_size(h2scf)  (h2scf->streams_index_mask + 1)
 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);
-static void ngx_http_v2_run_request_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_v2_process_request_body(ngx_http_request_t *r,
 u_char *pos, size_t size, ngx_uint_t last, ngx_uint_t flush);
 static ngx_int_t ngx_http_v2_filter_request_body(ngx_http_request_t *r);
 static void ngx_http_v2_read_client_request_body_handler(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)
 {
 u_char                    *p, *end;
 ngx_connection_t          *c;
 h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
 h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
-h2c->concurrent_pushes = h2scf->concurrent_pushes;
 h2c->priority_limit = ngx_max(h2scf->concurrent_streams, 100);
 h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
 if (h2c->pool == NULL) {
 ngx_http_close_connection(c);
 if (c->error) {
 ngx_http_v2_finalize_connection(h2c, 0);
 return;
 }
-if (!h2c->processing && !h2c->pushing) {
+if (!h2c->processing) {
 ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
 return;
 }
 if (!h2c->goaway) {
 if (n == NGX_AGAIN) {
 break;
 }
-if (n == 0
+if (n == 0 && (h2c->state.incomplete || h2c->processing)) {
-&& (h2c->state.incomplete || h2c->processing || h2c->pushing))
-{
 ngx_log_error(NGX_LOG_INFO, c->log, 0,
 "client prematurely closed connection");
 }
 if (n == 0 || n == NGX_ERROR) {
 {
 ngx_int_t                  rc;
 ngx_connection_t          *c;
 ngx_http_core_loc_conf_t  *clcf;
-if (h2c->last_out || h2c->processing || h2c->pushing) {
+if (h2c->last_out || h2c->processing) {
 return;
 }
 c = h2c->connection;
 if (node->parent) {
 ngx_queue_remove(&node->reuse);
 h2c->closed_nodes--;
 }
-stream = ngx_http_v2_create_stream(h2c, 0);
+stream = ngx_http_v2_create_stream(h2c);
 if (stream == NULL) {
 return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
 }
 h2c->state.stream = stream;
 case NGX_HTTP_V2_CANCEL:
 ngx_log_error(NGX_LOG_INFO, fc->log, 0,
 "client canceled stream %ui", h2c->state.sid);
 break;
-case NGX_HTTP_V2_REFUSED_STREAM:
-ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-"client refused stream %ui", h2c->state.sid);
-break;
 case NGX_HTTP_V2_INTERNAL_ERROR:
 ngx_log_error(NGX_LOG_INFO, fc->log, 0,
 "client terminated stream %ui due to internal error",
 h2c->state.sid);
 break;
 ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
 u_char *end)
 {
 ssize_t                   window_delta;
 ngx_uint_t                id, value;
-ngx_http_v2_srv_conf_t   *h2scf;
 ngx_http_v2_out_frame_t  *frame;
 window_delta = 0;
 while (h2c->state.length) {
 return ngx_http_v2_connection_error(h2c,
 NGX_HTTP_V2_PROTOCOL_ERROR);
 }
-h2c->push_disabled = !value;
-break;
-case NGX_HTTP_V2_MAX_STREAMS_SETTING:
-h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-ngx_http_v2_module);
-h2c->concurrent_pushes = ngx_min(value, h2scf->concurrent_pushes);
 break;
 case NGX_HTTP_V2_HEADER_TABLE_SIZE_SETTING:
 h2c->table_update = 1;
 if (end == start + NGX_HTTP_V2_INT_OCTETS) {
 return NGX_DECLINED;
 }
 return NGX_AGAIN;
-}
-ngx_http_v2_stream_t *
-ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent, ngx_str_t *path)
-{
-ngx_int_t                     rc;
-ngx_str_t                     value;
-ngx_pool_t                   *pool;
-ngx_uint_t                    index;
-ngx_table_elt_t             **h;
-ngx_connection_t             *fc;
-ngx_http_request_t           *r;
-ngx_http_v2_node_t           *node;
-ngx_http_v2_stream_t         *stream;
-ngx_http_v2_srv_conf_t       *h2scf;
-ngx_http_v2_connection_t     *h2c;
-ngx_http_v2_parse_header_t   *header;
-h2c = parent->connection;
-pool = ngx_create_pool(1024, h2c->connection->log);
-if (pool == NULL) {
-goto rst_stream;
-}
-node = ngx_http_v2_get_node_by_id(h2c, h2c->last_push, 1);
-if (node == NULL) {
-ngx_destroy_pool(pool);
-goto rst_stream;
-}
-stream = ngx_http_v2_create_stream(h2c, 1);
-if (stream == NULL) {
-if (node->parent == NULL) {
-h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-ngx_http_v2_module);
-index = ngx_http_v2_index(h2scf, h2c->last_push);
-h2c->streams_index[index] = node->index;
-ngx_queue_insert_tail(&h2c->closed, &node->reuse);
-h2c->closed_nodes++;
-}
-ngx_destroy_pool(pool);
-goto rst_stream;
-}
-if (node->parent) {
-ngx_queue_remove(&node->reuse);
-h2c->closed_nodes--;
-}
-stream->pool = pool;
-r = stream->request;
-fc = r->connection;
-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, parent->node->id);
-node->weight = NGX_HTTP_V2_DEFAULT_WEIGHT;
-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.data = ngx_pstrdup(pool, &parent->request->schema);
-if (r->schema.data == NULL) {
-goto close;
-}
-r->schema.len = parent->request->schema.len;
-value.data = ngx_pstrdup(pool, path);
-if (value.data == NULL) {
-goto close;
-}
-value.len = path->len;
-rc = ngx_http_v2_parse_path(r, &value);
-if (rc != NGX_OK) {
-goto error;
-}
-for (header = ngx_http_v2_parse_headers; header->name.len; header++) {
-h = (ngx_table_elt_t **)
-((char *) &parent->request->headers_in + header->offset);
-if (*h == NULL) {
-continue;
-}
-value.len = (*h)->value.len;
-value.data = ngx_pnalloc(pool, value.len + 1);
-if (value.data == NULL) {
-goto close;
-}
-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 stream;
-error:
-if (rc == NGX_ABORT) {
-/* header handler has already finalized request */
-ngx_http_run_posted_requests(fc);
-return NULL;
-}
-if (rc == NGX_DECLINED) {
-ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-ngx_http_run_posted_requests(fc);
-return NULL;
-}
-close:
-ngx_http_v2_close_stream(stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
-return NULL;
-rst_stream:
-if (ngx_http_v2_send_rst_stream(h2c, h2c->last_push,
-NGX_HTTP_INTERNAL_SERVER_ERROR)
-!= NGX_OK)
-{
-h2c->connection->error = 1;
-}
-return NULL;
 }
 static ngx_int_t
 ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c)
 return NGX_OK;
 }
 static ngx_http_v2_stream_t *
-ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
+ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
 {
 ngx_log_t                 *log;
 ngx_event_t               *rev, *wev;
 ngx_connection_t          *fc;
 ngx_http_log_ctx_t        *ctx;
 }
 ngx_memcpy(log, h2c->connection->log, sizeof(ngx_log_t));
 log->data = ctx;
+log->action = "reading client request headers";
-if (push) {
-log->action = "processing pushed request headers";
-} else {
-log->action = "reading client request headers";
-}
 ngx_memzero(rev, sizeof(ngx_event_t));
 rev->data = fc;
 rev->ready = 1;
 h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
 stream->send_window = h2c->init_window;
 stream->recv_window = h2scf->preread_size;
-if (push) {
+h2c->processing++;
-h2c->pushing++;
-} else {
-h2c->processing++;
-}
 h2c->priority_limit += h2scf->concurrent_streams;
 if (h2c->connection->read->timer_set) {
 ngx_del_timer(h2c->connection->read);
 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->key.len = header->name.len;
+h->hash = ngx_hash(ngx_hash(ngx_hash('h', 'o'), 's'), 't');
-h->key.data = header->name.data;
-h->lowcase_key = header->name.data;
+h->key.len = host.len;
+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;
-if (header->hh->handler(r, h, header->hh->offset) != NGX_OK) {
+h->lowcase_key = host.data;
-/* 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;
 }
 ngx_http_process_request(r);
 failed:
 ngx_http_run_posted_requests(fc);
-}
-static void
-ngx_http_v2_run_request_handler(ngx_event_t *ev)
-{
-ngx_connection_t    *fc;
-ngx_http_request_t  *r;
-fc = ev->data;
-r = fc->data;
-ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-"http2 run request handler");
-ngx_http_v2_run_request(r);
 }
 ngx_int_t
 ngx_http_v2_read_request_body(ngx_http_request_t *r)
 void
 ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 {
 ngx_pool_t                *pool;
-ngx_uint_t                 push;
 ngx_event_t               *ev;
 ngx_connection_t          *fc;
 ngx_http_v2_node_t        *node;
 ngx_http_v2_connection_t  *h2c;
 h2c = stream->connection;
 node = stream->node;
-ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-"http2 close stream %ui, queued %ui, "
+"http2 close stream %ui, queued %ui, processing %ui",
-"processing %ui, pushing %ui",
+node->id, stream->queued, h2c->processing);
-node->id, stream->queued, h2c->processing, h2c->pushing);
 fc = stream->request->connection;
 if (stream->queued) {
 fc->error = 1;
 if (h2c->state.stream == stream) {
 h2c->state.stream = NULL;
 }
-push = stream->node->id % 2 == 0;
 node->stream = NULL;
 ngx_queue_insert_tail(&h2c->closed, &node->reuse);
 h2c->closed_nodes++;
 }
 fc->data = h2c->free_fake_connections;
 h2c->free_fake_connections = fc;
-if (push) {
+h2c->processing--;
-h2c->pushing--;
+if (h2c->processing || h2c->blocked) {
-} else {
-h2c->processing--;
-}
-if (h2c->processing || h2c->pushing || h2c->blocked) {
 return;
 }
 ev = h2c->connection->read;
 if (ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
 (void) ngx_http_v2_send_output_queue(h2c);
 }
 }
-if (!h2c->processing && !h2c->pushing) {
+if (!h2c->processing) {
 goto done;
 }
 c->read->handler = ngx_http_empty_handler;
 c->write->handler = ngx_http_empty_handler;
 }
 }
 h2c->blocked = 0;
-if (h2c->processing || h2c->pushing) {
+if (h2c->processing) {
 c->error = 1;
 return;
 }
 done:

Mercurial > hg > nginx

comparison src/http/v2/ngx_http_v2.c @ 9121:262c01782566