comparison src/core/ngx_open_file_cache.c @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 566e105a89f1
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
488 goto done; 488 goto done;
489 } 489 }
490 } 490 }
491 491
492 if (!of->log) { 492 if (!of->log) {
493 fd = ngx_open_file(name, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0); 493
494 /*
495 * Use non-blocking open() not to hang on FIFO files, etc.
496 * This flag has no effect on a regular files.
497 */
498
499 fd = ngx_open_file(name, NGX_FILE_RDONLY|NGX_FILE_NONBLOCK,
500 NGX_FILE_OPEN, 0);
494 501
495 } else { 502 } else {
496 fd = ngx_open_file(name, NGX_FILE_APPEND, NGX_FILE_CREATE_OR_OPEN, 503 fd = ngx_open_file(name, NGX_FILE_APPEND, NGX_FILE_CREATE_OR_OPEN,
497 NGX_FILE_DEFAULT_ACCESS); 504 NGX_FILE_DEFAULT_ACCESS);
498 } 505 }