Mercurial > hg > nginx
changeset 6629:8ed51b02f655
Stream: style.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Tue, 12 Jul 2016 17:34:40 +0300 |
parents | 7cbc6bc63228 |
children | 558db057adaa |
files | src/stream/ngx_stream_limit_conn_module.c src/stream/ngx_stream_map_module.c src/stream/ngx_stream_return_module.c src/stream/ngx_stream_upstream.c src/stream/ngx_stream_upstream_hash_module.c src/stream/ngx_stream_upstream_least_conn_module.c src/stream/ngx_stream_upstream_zone_module.c |
diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stream/ngx_stream_limit_conn_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_limit_conn_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -101,7 +101,7 @@ NULL, /* init main configuration */ ngx_stream_limit_conn_create_conf, /* create server configuration */ - ngx_stream_limit_conn_merge_conf, /* merge server configuration */ + ngx_stream_limit_conn_merge_conf /* merge server configuration */ };
--- a/src/stream/ngx_stream_map_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_map_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -81,7 +81,7 @@ NULL, /* init main configuration */ NULL, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };
--- a/src/stream/ngx_stream_return_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_return_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -48,7 +48,7 @@ NULL, /* init main configuration */ ngx_stream_return_create_srv_conf, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };
--- a/src/stream/ngx_stream_upstream.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_upstream.c Tue Jul 12 17:34:40 2016 +0300 @@ -46,7 +46,7 @@ ngx_stream_upstream_init_main_conf, /* init main configuration */ NULL, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };
--- a/src/stream/ngx_stream_upstream_hash_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_upstream_hash_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -84,7 +84,7 @@ NULL, /* init main configuration */ ngx_stream_upstream_hash_create_conf, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };
--- a/src/stream/ngx_stream_upstream_least_conn_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_upstream_least_conn_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -39,7 +39,7 @@ NULL, /* init main configuration */ NULL, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };
--- a/src/stream/ngx_stream_upstream_zone_module.c Tue Jul 12 12:38:01 2016 +0300 +++ b/src/stream/ngx_stream_upstream_zone_module.c Tue Jul 12 17:34:40 2016 +0300 @@ -39,7 +39,7 @@ NULL, /* init main configuration */ NULL, /* create server configuration */ - NULL, /* merge server configuration */ + NULL /* merge server configuration */ };