IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge r3515:

Browse Source 
fix segfault: ngx_http_upstream_cleanup() cleans r->cleanup,
the bug had been introduced in r3426
This commit is contained in:
Igor Sysoev 2010-06-07 11:46:43 +00:00
parent 4fd0e896db
commit 0625f491f4
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ngx_http_upstream.c
View File

@ -363,8 +363,6 @@ ngx_http_upstream_create(ngx_http_request_t *r)
if (u && u->cleanup) { if (u && u->cleanup) {
ngx_http_upstream_cleanup(r); ngx_http_upstream_cleanup(r);
*u->cleanup = NULL;
u->cleanup = NULL;
} }
u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));