Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 8921:33226ac61076 quic
HTTP/3: merged ngx_http_quic_module into ngx_http_v3_module.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Mon, 06 Dec 2021 13:02:36 +0300 |
parents | 0d3bf08eaac0 |
children | be08b858086a |
comparison
equal
deleted
inserted
replaced
8920:9680f0badc95 | 8921:33226ac61076 |
---|---|
314 c->log->data = ctx; | 314 c->log->data = ctx; |
315 c->log->action = "waiting for request"; | 315 c->log->action = "waiting for request"; |
316 | 316 |
317 c->log_error = NGX_ERROR_INFO; | 317 c->log_error = NGX_ERROR_INFO; |
318 | 318 |
319 #if (NGX_HTTP_QUIC) | |
320 if (hc->addr_conf->quic) { | |
321 if (ngx_http_quic_init(c) == NGX_DONE) { | |
322 return; | |
323 } | |
324 } | |
325 #endif | |
326 | |
327 rev = c->read; | 319 rev = c->read; |
328 rev->handler = ngx_http_wait_request_handler; | 320 rev->handler = ngx_http_wait_request_handler; |
329 c->write->handler = ngx_http_empty_handler; | 321 c->write->handler = ngx_http_empty_handler; |
330 | 322 |
331 #if (NGX_HTTP_V2) | 323 #if (NGX_HTTP_V2) |
333 rev->handler = ngx_http_v2_init; | 325 rev->handler = ngx_http_v2_init; |
334 } | 326 } |
335 #endif | 327 #endif |
336 | 328 |
337 #if (NGX_HTTP_V3) | 329 #if (NGX_HTTP_V3) |
338 if (hc->addr_conf->http3) { | 330 if (hc->addr_conf->quic) { |
339 ngx_http_v3_init(c); | 331 ngx_http_v3_init(c); |
340 return; | 332 return; |
341 } | 333 } |
342 #endif | 334 #endif |
343 | 335 |
2744 ngx_http_close_request(r, 0); | 2736 ngx_http_close_request(r, 0); |
2745 return; | 2737 return; |
2746 } | 2738 } |
2747 #endif | 2739 #endif |
2748 | 2740 |
2749 #if (NGX_HTTP_QUIC) | 2741 #if (NGX_HTTP_V3) |
2750 if (r->connection->quic) { | 2742 if (r->connection->quic) { |
2751 ngx_http_close_request(r, 0); | 2743 ngx_http_close_request(r, 0); |
2752 return; | 2744 return; |
2753 } | 2745 } |
2754 #endif | 2746 #endif |
2965 return; | 2957 return; |
2966 } | 2958 } |
2967 | 2959 |
2968 #endif | 2960 #endif |
2969 | 2961 |
2970 #if (NGX_HTTP_QUIC) | 2962 #if (NGX_HTTP_V3) |
2971 | 2963 |
2972 if (c->quic) { | 2964 if (c->quic) { |
2973 if (c->read->error) { | 2965 if (c->read->error) { |
2974 err = 0; | 2966 err = 0; |
2975 goto closed; | 2967 goto closed; |
3730 } | 3722 } |
3731 | 3723 |
3732 log->action = "closing request"; | 3724 log->action = "closing request"; |
3733 | 3725 |
3734 if (r->connection->timedout | 3726 if (r->connection->timedout |
3735 #if (NGX_HTTP_QUIC) | 3727 #if (NGX_HTTP_V3) |
3736 && r->connection->quic == NULL | 3728 && r->connection->quic == NULL |
3737 #endif | 3729 #endif |
3738 ) | 3730 ) |
3739 { | 3731 { |
3740 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | 3732 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
3808 } | 3800 } |
3809 | 3801 |
3810 #endif | 3802 #endif |
3811 | 3803 |
3812 #if (NGX_HTTP_V3) | 3804 #if (NGX_HTTP_V3) |
3813 if (ngx_http_v3_connection(c)) { | 3805 if (c->quic) { |
3814 ngx_http_v3_reset_connection(c); | 3806 ngx_http_v3_reset_connection(c); |
3815 } | 3807 } |
3816 #endif | 3808 #endif |
3817 | 3809 |
3818 #if (NGX_STAT_STUB) | 3810 #if (NGX_STAT_STUB) |