Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.h @ 6715:d200a0fd00b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced the NGX_COMPAT macro. When enabled, some structures are padded to be size compatible with their NGINX Plus versions.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 29 Sep 2016 15:28:24 +0300
parents e08e741f74cd
children e38e9c50a40e
comparison
equal deleted inserted replaced
6714:c3e3de6d2672 6715:d200a0fd00b7
100 time_t fail_timeout; 100 time_t fail_timeout;
101 ngx_msec_t slow_start; 101 ngx_msec_t slow_start;
102 102
103 unsigned down:1; 103 unsigned down:1;
104 unsigned backup:1; 104 unsigned backup:1;
105
106 NGX_COMPAT_BEGIN(6)
107 NGX_COMPAT_END
105 } ngx_http_upstream_server_t; 108 } ngx_http_upstream_server_t;
106 109
107 110
108 #define NGX_HTTP_UPSTREAM_CREATE 0x0001 111 #define NGX_HTTP_UPSTREAM_CREATE 0x0001
109 #define NGX_HTTP_UPSTREAM_WEIGHT 0x0002 112 #define NGX_HTTP_UPSTREAM_WEIGHT 0x0002
227 ngx_flag_t ssl_server_name; 230 ngx_flag_t ssl_server_name;
228 ngx_flag_t ssl_verify; 231 ngx_flag_t ssl_verify;
229 #endif 232 #endif
230 233
231 ngx_str_t module; 234 ngx_str_t module;
235
236 NGX_COMPAT_BEGIN(2)
237 NGX_COMPAT_END
232 } ngx_http_upstream_conf_t; 238 } ngx_http_upstream_conf_t;
233 239
234 240
235 typedef struct { 241 typedef struct {
236 ngx_str_t name; 242 ngx_str_t name;
380 unsigned upgrade:1; 386 unsigned upgrade:1;
381 387
382 unsigned request_sent:1; 388 unsigned request_sent:1;
383 unsigned request_body_sent:1; 389 unsigned request_body_sent:1;
384 unsigned header_sent:1; 390 unsigned header_sent:1;
391
392 NGX_COMPAT_BEGIN(1)
393 NGX_COMPAT_END
385 }; 394 };
386 395
387 396
388 typedef struct { 397 typedef struct {
389 ngx_uint_t status; 398 ngx_uint_t status;