Mercurial > hg > nginx

comparison src/http/modules/ngx_http_autoindex_module.c @ 2049:2a92804f4109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) back out r2040 *) refactor ngx_palloc() *) introduce ngx_pnalloc() *) additional pool blocks have smaller header
author Igor Sysoev <igor@sysoev.ru>
date Tue, 17 Jun 2008 15:00:30 +0000
parents bf5521329069
children 2f2052fdd882
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
280 280
281 if (path.len + 1 + len + 1 > allocated) { 281 if (path.len + 1 + len + 1 > allocated) {
282 allocated = path.len + 1 + len + 1 282 allocated = path.len + 1 + len + 1
283 + NGX_HTTP_AUTOINDEX_PREALLOCATE; 283 + NGX_HTTP_AUTOINDEX_PREALLOCATE;
284 284
285 filename = ngx_palloc(pool, allocated); 285 filename = ngx_pnalloc(pool, allocated);
286 if (filename == NULL) { 286 if (filename == NULL) {
287 return ngx_http_autoindex_error(r, &dir, &path); 287 return ngx_http_autoindex_error(r, &dir, &path);
288 } 288 }
289 289
290 last = ngx_cpystrn(filename, path.data, path.len + 1); 290 last = ngx_cpystrn(filename, path.data, path.len + 1);
316 return ngx_http_autoindex_error(r, &dir, &path); 316 return ngx_http_autoindex_error(r, &dir, &path);
317 } 317 }
318 318
319 entry->name.len = len; 319 entry->name.len = len;
320 320
321 entry->name.data = ngx_palloc(pool, len + 1); 321 entry->name.data = ngx_pnalloc(pool, len + 1);
322 if (entry->name.data == NULL) { 322 if (entry->name.data == NULL) {
323 return ngx_http_autoindex_error(r, &dir, &path); 323 return ngx_http_autoindex_error(r, &dir, &path);
324 } 324 }
325 325
326 ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1); 326 ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);