Mercurial > hg > nginx

diff 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
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3061,7 +3061,7 @@ ngx_http_upstream_server(ngx_conf_t *cf,
     u.url = value[1];
     u.default_port = 80;
 
-    if (ngx_parse_url(cf, &u) != NGX_OK) {
+    if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
         if (u.err) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "%s in upstream \"%V\"", u.err, &u.url);
@@ -3165,7 +3165,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ng
 
     if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
 
-        if (ngx_parse_url(cf, u) != NGX_OK) {
+        if (ngx_parse_url(cf->pool, u) != NGX_OK) {
             if (u->err) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "%s in upstream \"%V\"", u->err, &u->url);