Mercurial > hg > nginx
diff src/http/modules/ngx_http_fastcgi_module.c @ 3006:95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
internal redirect
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 27 Jul 2009 13:25:29 +0000 |
parents | dff9764eaca2 |
children | 37400c84396e |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Jul 27 13:18:40 2009 +0000 +++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Jul 27 13:25:29 2009 +0000 @@ -543,20 +543,17 @@ return NGX_HTTP_INTERNAL_SERVER_ERROR; } + if (ngx_http_upstream_create(r) != NGX_OK) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t)); if (f == NULL) { - return NGX_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } ngx_http_set_ctx(r, f, ngx_http_fastcgi_module); - u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); - if (u == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } - - r->upstream = u; - flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); if (flcf->fastcgi_lengths) { @@ -565,15 +562,11 @@ } } + u = r->upstream; + u->schema.len = sizeof("fastcgi://") - 1; u->schema.data = (u_char *) "fastcgi://"; - u->peer.log = r->connection->log; - u->peer.log_error = NGX_ERROR_ERR; -#if (NGX_THREADS) - u->peer.lock = &r->connection->lock; -#endif - u->output.tag = (ngx_buf_tag_t) &ngx_http_fastcgi_module; u->conf = &flcf->upstream;