From d1bc1da950488d8d3114a06ca00346fa58848a2d Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Tue, 7 Dec 2021 13:01:28 +0300 Subject: [PATCH] HTTP/3: renamed files. ngx_http_v3_tables.h and ngx_http_v3_tables.c are renamed to ngx_http_v3_table.h and ngx_http_v3_table.c to better match HTTP/2 code. ngx_http_v3_streams.h and ngx_http_v3_streams.c are renamed to ngx_http_v3_uni.h and ngx_http_v3_uni.c to better match their content. --- auto/modules | 8 ++++---- src/http/v3/ngx_http_v3.h | 4 ++-- src/http/v3/{ngx_http_v3_tables.c => ngx_http_v3_table.c} | 0 src/http/v3/{ngx_http_v3_tables.h => ngx_http_v3_table.h} | 6 +++--- src/http/v3/{ngx_http_v3_streams.c => ngx_http_v3_uni.c} | 0 src/http/v3/{ngx_http_v3_streams.h => ngx_http_v3_uni.h} | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/http/v3/{ngx_http_v3_tables.c => ngx_http_v3_table.c} (100%) rename src/http/v3/{ngx_http_v3_tables.h => ngx_http_v3_table.h} (92%) rename src/http/v3/{ngx_http_v3_streams.c => ngx_http_v3_uni.c} (100%) rename src/http/v3/{ngx_http_v3_streams.h => ngx_http_v3_uni.h} (89%) diff --git a/auto/modules b/auto/modules index f98eeafed..bc1b9bafd 100644 --- a/auto/modules +++ b/auto/modules @@ -448,13 +448,13 @@ if [ $HTTP = YES ]; then ngx_module_deps="src/http/v3/ngx_http_v3.h \ src/http/v3/ngx_http_v3_encode.h \ src/http/v3/ngx_http_v3_parse.h \ - src/http/v3/ngx_http_v3_tables.h \ - src/http/v3/ngx_http_v3_streams.h" + src/http/v3/ngx_http_v3_table.h \ + src/http/v3/ngx_http_v3_uni.h" ngx_module_srcs="src/http/v3/ngx_http_v3.c \ src/http/v3/ngx_http_v3_encode.c \ src/http/v3/ngx_http_v3_parse.c \ - src/http/v3/ngx_http_v3_tables.c \ - src/http/v3/ngx_http_v3_streams.c \ + src/http/v3/ngx_http_v3_table.c \ + src/http/v3/ngx_http_v3_uni.c \ src/http/v3/ngx_http_v3_request.c \ src/http/v3/ngx_http_v3_module.c" ngx_module_libs= diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h index 91fa19f10..b7951e9bb 100644 --- a/src/http/v3/ngx_http_v3.h +++ b/src/http/v3/ngx_http_v3.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #define NGX_HTTP_V3_ALPN_PROTO "\x02h3" diff --git a/src/http/v3/ngx_http_v3_tables.c b/src/http/v3/ngx_http_v3_table.c similarity index 100% rename from src/http/v3/ngx_http_v3_tables.c rename to src/http/v3/ngx_http_v3_table.c diff --git a/src/http/v3/ngx_http_v3_tables.h b/src/http/v3/ngx_http_v3_table.h similarity index 92% rename from src/http/v3/ngx_http_v3_tables.h rename to src/http/v3/ngx_http_v3_table.h index 991cc12c9..6f88b35b9 100644 --- a/src/http/v3/ngx_http_v3_tables.h +++ b/src/http/v3/ngx_http_v3_table.h @@ -5,8 +5,8 @@ */ -#ifndef _NGX_HTTP_V3_TABLES_H_INCLUDED_ -#define _NGX_HTTP_V3_TABLES_H_INCLUDED_ +#ifndef _NGX_HTTP_V3_TABLE_H_INCLUDED_ +#define _NGX_HTTP_V3_TABLE_H_INCLUDED_ #include @@ -50,4 +50,4 @@ ngx_int_t ngx_http_v3_set_param(ngx_connection_t *c, uint64_t id, uint64_t value); -#endif /* _NGX_HTTP_V3_TABLES_H_INCLUDED_ */ +#endif /* _NGX_HTTP_V3_TABLE_H_INCLUDED_ */ diff --git a/src/http/v3/ngx_http_v3_streams.c b/src/http/v3/ngx_http_v3_uni.c similarity index 100% rename from src/http/v3/ngx_http_v3_streams.c rename to src/http/v3/ngx_http_v3_uni.c diff --git a/src/http/v3/ngx_http_v3_streams.h b/src/http/v3/ngx_http_v3_uni.h similarity index 89% rename from src/http/v3/ngx_http_v3_streams.h rename to src/http/v3/ngx_http_v3_uni.h index 42ff849be..8c1eb99d3 100644 --- a/src/http/v3/ngx_http_v3_streams.h +++ b/src/http/v3/ngx_http_v3_uni.h @@ -5,8 +5,8 @@ */ -#ifndef _NGX_HTTP_V3_STREAMS_H_INCLUDED_ -#define _NGX_HTTP_V3_STREAMS_H_INCLUDED_ +#ifndef _NGX_HTTP_V3_UNI_H_INCLUDED_ +#define _NGX_HTTP_V3_UNI_H_INCLUDED_ #include @@ -35,4 +35,4 @@ ngx_int_t ngx_http_v3_send_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc); -#endif /* _NGX_HTTP_V3_STREAMS_H_INCLUDED_ */ +#endif /* _NGX_HTTP_V3_UNI_H_INCLUDED_ */