Mercurial > hg > nginx

comparison src/os/win32/ngx_files.c @ 3433:6b8284fc958d stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3201, r3204, r3411: ngx_http_autoindex_module fixes: *) reset cached dirent.d_type after stat() this fixes slash after link to a directory in ngx_http_autoindex_module; *) use cached dirent.d_type as hint on all systems the issues has been introduced in r2235 *) fix ngx_utf8_cpystrn(): it did not fully copy utf-8 string
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 14:52:25 +0000
parents 5795b2710eef
children d65ba5392f59
comparison
equal deleted inserted replaced
3432:20871c5e1d5d 3433:6b8284fc958d
374 if (dir->dir == INVALID_HANDLE_VALUE) { 374 if (dir->dir == INVALID_HANDLE_VALUE) {
375 return NGX_ERROR; 375 return NGX_ERROR;
376 } 376 }
377 377
378 dir->valid_info = 1; 378 dir->valid_info = 1;
379 dir->valid_type = 1;
380 dir->ready = 1; 379 dir->ready = 1;
381 380
382 return NGX_OK; 381 return NGX_OK;
383 } 382 }
384 383
390 dir->ready = 0; 389 dir->ready = 0;
391 return NGX_OK; 390 return NGX_OK;
392 } 391 }
393 392
394 if (FindNextFile(dir->dir, &dir->finddata) != 0) { 393 if (FindNextFile(dir->dir, &dir->finddata) != 0) {
394 dir->type = 1;
395 return NGX_OK; 395 return NGX_OK;
396 } 396 }
397 397
398 return NGX_ERROR; 398 return NGX_ERROR;
399 } 399 }