diff options
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_userid_filter.c | 3 | ||||
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_handler.c | 4 | ||||
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_handler.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_userid_filter.c b/src/http/modules/ngx_http_userid_filter.c index 718cca7e2..e37accf8f 100644 --- a/src/http/modules/ngx_http_userid_filter.c +++ b/src/http/modules/ngx_http_userid_filter.c @@ -281,7 +281,6 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r, size_t len; socklen_t slen; struct sockaddr_in addr_in; - uint32_t service; ngx_str_t src, dst; ngx_table_elt_t *set_cookie; @@ -542,7 +541,7 @@ char *ngx_conf_check_domain(ngx_conf_t *cf, void *post, void *data) if (domain->len == 4 && ngx_strcmp(domain->data, "none") == 0) { domain->len = 1; - domain->data = "."; + domain->data = (u_char *) "."; } return NGX_CONF_OK; diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c index 711aad2f4..af9760c2e 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.c +++ b/src/http/modules/proxy/ngx_http_proxy_handler.c @@ -1234,7 +1234,7 @@ static char *ngx_http_proxy_parse_upstream(ngx_str_t *url, u->default_port = 1; } - u->port = htons((u_short) u->port); + u->port = htons(u->port); return NULL; } } @@ -1265,7 +1265,7 @@ static char *ngx_http_proxy_parse_upstream(ngx_str_t *url, if (u->port_text.len > 0) { u->port = ngx_atoi(u->port_text.data, u->port_text.len); if (u->port > 0) { - u->port = htons((u_short) u->port); + u->port = htons(u->port); return NULL; } } diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.h b/src/http/modules/proxy/ngx_http_proxy_handler.h index 6e3725899..27799bbb9 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.h +++ b/src/http/modules/proxy/ngx_http_proxy_handler.h @@ -41,7 +41,7 @@ typedef struct { ngx_str_t port_text; ngx_str_t *location; - ngx_int_t port; + in_port_t port; unsigned default_port:1; } ngx_http_proxy_upstream_conf_t; |