Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 1710:20a0f2880d45 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1560 merge: use pool instead of ngx_conf_t
author Igor Sysoev <igor@sysoev.ru>
date Wed, 12 Dec 2007 16:51:43 +0000
parents a179755ee1ea
children 6b81bbc36eaf
comparison
equal deleted inserted replaced
1709:a179755ee1ea 1710:20a0f2880d45
3059 ngx_memzero(&u, sizeof(ngx_url_t)); 3059 ngx_memzero(&u, sizeof(ngx_url_t));
3060 3060
3061 u.url = value[1]; 3061 u.url = value[1];
3062 u.default_port = 80; 3062 u.default_port = 80;
3063 3063
3064 if (ngx_parse_url(cf, &u) != NGX_OK) { 3064 if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
3065 if (u.err) { 3065 if (u.err) {
3066 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3066 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3067 "%s in upstream \"%V\"", u.err, &u.url); 3067 "%s in upstream \"%V\"", u.err, &u.url);
3068 } 3068 }
3069 3069
3163 ngx_http_upstream_srv_conf_t *uscf, **uscfp; 3163 ngx_http_upstream_srv_conf_t *uscf, **uscfp;
3164 ngx_http_upstream_main_conf_t *umcf; 3164 ngx_http_upstream_main_conf_t *umcf;
3165 3165
3166 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) { 3166 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
3167 3167
3168 if (ngx_parse_url(cf, u) != NGX_OK) { 3168 if (ngx_parse_url(cf->pool, u) != NGX_OK) {
3169 if (u->err) { 3169 if (u->err) {
3170 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3170 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3171 "%s in upstream \"%V\"", u->err, &u->url); 3171 "%s in upstream \"%V\"", u->err, &u->url);
3172 } 3172 }
3173 3173