mirror of
https://git.freebsd.org/ports.git
synced 2025-07-04 02:49:14 -04:00
09d995fd2c
ChangeLog: http://nginx.org/en/CHANGES-1.12 Remove IPV6 knob, IPv6 now compiled-in automatically if support is found. Also, remove third-party modules: o) udplog o) statsd Enable third_party mod_zip module back by changing upstream. Upgrade third-party modules: o) lua to 0.10.8 o) upstream_fair to b5be36f (upstream has been changed) o) upload to 72ec037 (upstream has been changed). o) http_auth_krb5 to 0c6ff3f. o) party njs to 0.1.10. Please see this comment in case of the production use of the lua module: https://github.com/openresty/lua-nginx-module/pull/1017#issuecomment-294076002 Patches obtained from: o)0459a285cao)d19df15904
21 lines
824 B
Text
21 lines
824 B
Text
--- ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c.orig 2016-11-20 15:42:48.550372000 -0500
|
|
+++ ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c 2016-11-20 15:45:24.507554000 -0500
|
|
@@ -565,8 +565,7 @@
|
|
|
|
|
|
/* an upstream implicitly defined by proxy_pass, etc. */
|
|
-
|
|
- if (us->port == 0 && us->default_port == 0) {
|
|
+ if (us->port == 0) {
|
|
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
|
"no port in upstream \"%V\" in %s:%ui",
|
|
&us->host, us->file_name, us->line);
|
|
@@ -576,7 +575,7 @@
|
|
ngx_memzero(&u, sizeof(ngx_url_t));
|
|
|
|
u.host = us->host;
|
|
- u.port = (in_port_t) (us->port ? us->port : us->default_port);
|
|
+ u.port = (in_port_t) us->port;
|
|
|
|
if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
|
|
if (u.err) {
|