comparison src/os/unix/ngx_files.h @ 372:6639b93e81b2 NGINX_0_6_30

nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents 675a39fd14cd
children 0b6053502c55
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
15 #define NGX_INVALID_FILE -1 15 #define NGX_INVALID_FILE -1
16 #define NGX_FILE_ERROR -1 16 #define NGX_FILE_ERROR -1
17 17
18 18
19 19
20 #ifdef __CYGWIN__
21
22 #define ngx_open_file(name, mode, create, access) \
23 open((const char *) name, mode|create|O_BINARY, access)
24
25 #else
26
20 #define ngx_open_file(name, mode, create, access) \ 27 #define ngx_open_file(name, mode, create, access) \
21 open((const char *) name, mode|create, access) 28 open((const char *) name, mode|create, access)
29
30 #endif
31
22 #define ngx_open_file_n "open()" 32 #define ngx_open_file_n "open()"
23 33
24 #define NGX_FILE_RDONLY O_RDONLY 34 #define NGX_FILE_RDONLY O_RDONLY
25 #define NGX_FILE_WRONLY O_WRONLY 35 #define NGX_FILE_WRONLY O_WRONLY
26 #define NGX_FILE_RDWR O_RDWR 36 #define NGX_FILE_RDWR O_RDWR
142 #define ngx_de_size(dir) (dir)->info.st_size 152 #define ngx_de_size(dir) (dir)->info.st_size
143 #define ngx_de_mtime(dir) (dir)->info.st_mtime 153 #define ngx_de_mtime(dir) (dir)->info.st_mtime
144 154
145 155
146 typedef struct { 156 typedef struct {
147 size_t n; 157 size_t n;
148 glob_t pglob; 158 glob_t pglob;
149 u_char *pattern; 159 u_char *pattern;
150 ngx_log_t *log; 160 ngx_log_t *log;
161 ngx_uint_t test;
151 } ngx_glob_t; 162 } ngx_glob_t;
152 163
153 164
154 ngx_int_t ngx_open_glob(ngx_glob_t *gl); 165 ngx_int_t ngx_open_glob(ngx_glob_t *gl);
155 #define ngx_open_glob_n "glob()" 166 #define ngx_open_glob_n "glob()"