details: http://hg.nginx.org/nginx/rev/2a288909abc6
branches:
changeset: 7077:2a288909abc6
user: Ruslan Ermilov <ru@nginx.com>
date: Tue Aug 01 14:28:33 2017 +0300
description:
Variables: macros for null variables.

No functional changes.

diffstat:

src/http/modules/ngx_http_browser_module.c | 2 +-
src/http/modules/ngx_http_fastcgi_module.c | 2 +-
src/http/modules/ngx_http_geoip_module.c | 2 +-
src/http/modules/ngx_http_proxy_module.c | 2 +-
src/http/modules/ngx_http_realip_module.c | 2 +-
src/http/modules/ngx_http_ssi_filter_module.c | 2 +-
src/http/modules/ngx_http_ssl_module.c | 2 +-
src/http/modules/ngx_http_stub_status_module.c | 2 +-
src/http/ngx_http_upstream.c | 2 +-
src/http/ngx_http_variables.c | 2 +-
src/http/ngx_http_variables.h | 2 ++
src/http/v2/ngx_http_v2_module.c | 2 +-
src/stream/ngx_stream_geoip_module.c | 2 +-
src/stream/ngx_stream_realip_module.c | 2 +-
src/stream/ngx_stream_ssl_module.c | 2 +-
src/stream/ngx_stream_ssl_preread_module.c | 2 +-
src/stream/ngx_stream_upstream.c | 2 +-
src/stream/ngx_stream_variables.c | 2 +-
src/stream/ngx_stream_variables.h | 2 ++
19 files changed, 21 insertions(+), 17 deletions(-)

diffs (228 lines):

diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_browser_module.c
--- a/src/http/modules/ngx_http_browser_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_browser_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -222,7 +222,7 @@ static ngx_http_variable_t ngx_http_bro
{ ngx_string("ancient_browser"), NULL, ngx_http_browser_variable,
NGX_HTTP_ANCIENT_BROWSER, NGX_HTTP_VAR_CHANGEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -631,7 +631,7 @@ static ngx_http_variable_t ngx_http_fas
ngx_http_fastcgi_path_info_variable, 0,
NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_geoip_module.c
--- a/src/http/modules/ngx_http_geoip_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_geoip_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -232,7 +232,7 @@ static ngx_http_variable_t ngx_http_geo
ngx_http_geoip_city_int_variable,
offsetof(GeoIPRecord, area_code), 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -829,7 +829,7 @@ static ngx_http_variable_t ngx_http_pro
ngx_http_proxy_internal_chunked_variable, 0,
NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_realip_module.c
--- a/src/http/modules/ngx_http_realip_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_realip_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -122,7 +122,7 @@ static ngx_http_variable_t ngx_http_rea
{ ngx_string("realip_remote_port"), NULL,
ngx_http_realip_remote_port_variable, 0, 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_ssi_filter_module.c
--- a/src/http/modules/ngx_http_ssi_filter_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_ssi_filter_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -321,7 +321,7 @@ static ngx_http_variable_t ngx_http_ssi
{ ngx_string("date_gmt"), NULL, ngx_http_ssi_date_gmt_local_variable, 1,
NGX_HTTP_VAR_NOCACHEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_ssl_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -329,7 +329,7 @@ static ngx_http_variable_t ngx_http_ssl
{ ngx_string("ssl_client_v_remain"), NULL, ngx_http_ssl_variable,
(uintptr_t) ngx_ssl_get_client_v_remain, NGX_HTTP_VAR_CHANGEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/modules/ngx_http_stub_status_module.c
--- a/src/http/modules/ngx_http_stub_status_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/modules/ngx_http_stub_status_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -76,7 +76,7 @@ static ngx_http_variable_t ngx_http_stu
{ ngx_string("connections_waiting"), NULL, ngx_http_stub_status_variable,
3, NGX_HTTP_VAR_NOCACHEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/ngx_http_upstream.c Tue Aug 01 14:28:33 2017 +0300
@@ -427,7 +427,7 @@ static ngx_http_variable_t ngx_http_ups
{ ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/ngx_http_variables.c
--- a/src/http/ngx_http_variables.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/ngx_http_variables.c Tue Aug 01 14:28:33 2017 +0300
@@ -376,7 +376,7 @@ static ngx_http_variable_t ngx_http_cor
{ ngx_string("arg_"), NULL, ngx_http_variable_argument,
0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/ngx_http_variables.h
--- a/src/http/ngx_http_variables.h Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/ngx_http_variables.h Tue Aug 01 14:28:33 2017 +0300
@@ -43,6 +43,8 @@ struct ngx_http_variable_s {
ngx_uint_t index;
};

+#define ngx_http_null_variable { ngx_null_string, NULL, NULL, 0, 0, 0 }
+

ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name,
ngx_uint_t flags);
diff -r 1b82e86dd3e7 -r 2a288909abc6 src/http/v2/ngx_http_v2_module.c
--- a/src/http/v2/ngx_http_v2_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/http/v2/ngx_http_v2_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -225,7 +225,7 @@ static ngx_http_variable_t ngx_http_v2_
{ ngx_string("http2"), NULL,
ngx_http_v2_variable, 0, 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_http_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_geoip_module.c
--- a/src/stream/ngx_stream_geoip_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_geoip_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -210,7 +210,7 @@ static ngx_stream_variable_t ngx_stream
ngx_stream_geoip_city_int_variable,
offsetof(GeoIPRecord, area_code), 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_realip_module.c
--- a/src/stream/ngx_stream_realip_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_realip_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -89,7 +89,7 @@ static ngx_stream_variable_t ngx_stream
{ ngx_string("realip_remote_port"), NULL,
ngx_stream_realip_remote_port_variable, 0, 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_ssl_module.c
--- a/src/stream/ngx_stream_ssl_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_ssl_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -273,7 +273,7 @@ static ngx_stream_variable_t ngx_stream
{ ngx_string("ssl_client_v_remain"), NULL, ngx_stream_ssl_variable,
(uintptr_t) ngx_ssl_get_client_v_remain, NGX_STREAM_VAR_CHANGEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_ssl_preread_module.c
--- a/src/stream/ngx_stream_ssl_preread_module.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_ssl_preread_module.c Tue Aug 01 14:28:33 2017 +0300
@@ -85,7 +85,7 @@ static ngx_stream_variable_t ngx_stream
{ ngx_string("ssl_preread_server_name"), NULL,
ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_upstream.c
--- a/src/stream/ngx_stream_upstream.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_upstream.c Tue Aug 01 14:28:33 2017 +0300
@@ -100,7 +100,7 @@ static ngx_stream_variable_t ngx_stream
ngx_stream_upstream_bytes_variable, 1,
NGX_STREAM_VAR_NOCACHEABLE, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_variables.c
--- a/src/stream/ngx_stream_variables.c Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_variables.c Tue Aug 01 14:28:33 2017 +0300
@@ -111,7 +111,7 @@ static ngx_stream_variable_t ngx_stream
{ ngx_string("protocol"), NULL,
ngx_stream_variable_protocol, 0, 0, 0 },

- { ngx_null_string, NULL, NULL, 0, 0, 0 }
+ ngx_stream_null_variable
};


diff -r 1b82e86dd3e7 -r 2a288909abc6 src/stream/ngx_stream_variables.h
--- a/src/stream/ngx_stream_variables.h Tue Aug 01 14:27:23 2017 +0300
+++ b/src/stream/ngx_stream_variables.h Tue Aug 01 14:28:33 2017 +0300
@@ -43,6 +43,8 @@ struct ngx_stream_variable_s {
ngx_uint_t index;
};

+#define ngx_stream_null_variable { ngx_null_string, NULL, NULL, 0, 0, 0 }
+

ngx_stream_variable_t *ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name,
ngx_uint_t flags);
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel