Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 1559:fe11e2a3946d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use pool instead of ngx_conf_t
author Igor Sysoev <igor@sysoev.ru>
date Mon, 08 Oct 2007 08:55:12 +0000
parents 6d6c5ddedfc0
children 4c43e25d11ea
comparison
equal deleted inserted replaced
1558:6d6c5ddedfc0 1559:fe11e2a3946d
3063 ngx_memzero(&u, sizeof(ngx_url_t)); 3063 ngx_memzero(&u, sizeof(ngx_url_t));
3064 3064
3065 u.url = value[1]; 3065 u.url = value[1];
3066 u.default_port = 80; 3066 u.default_port = 80;
3067 3067
3068 if (ngx_parse_url(cf, &u) != NGX_OK) { 3068 if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
3069 if (u.err) { 3069 if (u.err) {
3070 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3070 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3071 "%s in upstream \"%V\"", u.err, &u.url); 3071 "%s in upstream \"%V\"", u.err, &u.url);
3072 } 3072 }
3073 3073
3178 ngx_http_upstream_srv_conf_t *uscf, **uscfp; 3178 ngx_http_upstream_srv_conf_t *uscf, **uscfp;
3179 ngx_http_upstream_main_conf_t *umcf; 3179 ngx_http_upstream_main_conf_t *umcf;
3180 3180
3181 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) { 3181 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
3182 3182
3183 if (ngx_parse_url(cf, u) != NGX_OK) { 3183 if (ngx_parse_url(cf->pool, u) != NGX_OK) {
3184 if (u->err) { 3184 if (u->err) {
3185 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3185 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3186 "%s in upstream \"%V\"", u->err, &u->url); 3186 "%s in upstream \"%V\"", u->err, &u->url);
3187 } 3187 }
3188 3188