Search
j0ke.net Open Build Service
>
Projects
>
home:kries
:
branches:internetx:projects:http
>
nginx
> 2bc1dac6fb3ed263529decb211ec784824132bf4.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 2bc1dac6fb3ed263529decb211ec784824132bf4.patch of Package nginx
From 2bc1dac6fb3ed263529decb211ec784824132bf4 Mon Sep 17 00:00:00 2001 From: Chris Lea <chris.lea@gmail.com> Date: Tue, 15 Nov 2016 22:26:35 -0800 Subject: [PATCH] default_port was removed in 1.11.6. --- ngx_http_upstream_fair_module.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c index a4419ca..66144e9 100644 --- a/ngx_http_upstream_fair_module.c +++ b/ngx_http_upstream_fair_module.c @@ -540,7 +540,11 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) /* an upstream implicitly defined by proxy_pass, etc. */ +#if nginx_version < 1011006 if (us->port == 0 && us->default_port == 0) { +#else + if (us->port == 0) { +#endif ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "no port in upstream \"%V\" in %s:%ui", &us->host, us->file_name, us->line); @@ -550,8 +554,11 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) ngx_memzero(&u, sizeof(ngx_url_t)); u.host = us->host; +#if nginx_version < 1011006 u.port = (in_port_t) (us->port ? us->port : us->default_port); - +#else + u.port = (in_port_t) us->port; +#endif if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { if (u.err) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0,