Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 672:f41d4b305d22 NGINX_1_2_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.2.0 *) Bugfix: a segmentation fault might occur in a worker process if the "try_files" directive was used; the bug had appeared in 1.1.19. *) Bugfix: response might be truncated if there were more than IOV_MAX buffers used. *) Bugfix: in the "crop" parameter of the "image_filter" directive. Thanks to Maxim Bublis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Apr 2012 00:00:00 +0400
parents ad45b044f1e5
children 4dcaf40cc702
comparison
equal deleted inserted replaced
671:47cb3497fbab 672:f41d4b305d22
1238 1238
1239 } else { 1239 } else {
1240 reserve = len > r->uri.len - alias ? len - (r->uri.len - alias) : 0; 1240 reserve = len > r->uri.len - alias ? len - (r->uri.len - alias) : 0;
1241 } 1241 }
1242 1242
1243 if (reserve > allocated) { 1243 if (reserve > allocated || !allocated) {
1244 1244
1245 /* 16 bytes are preallocation */ 1245 /* 16 bytes are preallocation */
1246 allocated = reserve + 16; 1246 allocated = reserve + 16;
1247 1247
1248 if (ngx_http_map_uri_to_path(r, &path, &root, allocated) == NULL) { 1248 if (ngx_http_map_uri_to_path(r, &path, &root, allocated) == NULL) {