Mercurial > hg > nginx
comparison src/core/ngx_inet.c @ 517:dadfa78d2270 release-0.1.33
nginx-0.1.33-RELEASE import
*) Bugfix: nginx could not be built with the --without-pcre parameter;
the bug had appeared in 0.1.29.
*) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one
level cause the bus fault on start up.
*) Bugfix: the HTTP protocol was specified in the HTTPS redirects.
*) Bugfix: if the "rewrite" directive used the captures inside the "if"
directive, then the 500 error code was returned.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 23 May 2005 12:07:45 +0000 |
parents | 417a087c9c4d |
children | 7bd37aef1e7e |
comparison
equal
deleted
inserted
replaced
516:ea9642a65514 | 517:dadfa78d2270 |
---|---|
223 ngx_peers_t * | 223 ngx_peers_t * |
224 ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u) | 224 ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u) |
225 { | 225 { |
226 char *err; | 226 char *err; |
227 u_char *host; | 227 u_char *host; |
228 size_t len; | |
228 in_addr_t in_addr; | 229 in_addr_t in_addr; |
229 ngx_uint_t i, len; | 230 ngx_uint_t i; |
230 ngx_peers_t *peers; | 231 ngx_peers_t *peers; |
231 struct hostent *h; | 232 struct hostent *h; |
232 struct sockaddr_in *sin; | 233 struct sockaddr_in *sin; |
233 | 234 |
234 err = ngx_inet_parse_host_port(u); | 235 err = ngx_inet_parse_host_port(u); |
279 host = ngx_palloc(cf->pool, u->host.len + 1); | 280 host = ngx_palloc(cf->pool, u->host.len + 1); |
280 if (host == NULL) { | 281 if (host == NULL) { |
281 return NULL; | 282 return NULL; |
282 } | 283 } |
283 | 284 |
284 ngx_cpystrn(host, u->host.data, u->host.len + 1); | 285 (void) ngx_cpystrn(host, u->host.data, u->host.len + 1); |
285 | 286 |
286 /* AF_INET only */ | 287 /* AF_INET only */ |
287 | 288 |
288 in_addr = inet_addr((char *) host); | 289 in_addr = inet_addr((char *) host); |
289 | 290 |