diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 12:07:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 12:07:45 +0000 |
| commit | 4959ec482e14884e6c132ed0533c6d62bcc89405 (patch) | |
| tree | 1993d130e544b3672fb4e612f805aaa8af140566 /src/os/unix | |
| parent | debb8a42db100ed27e92cd8126b93844c8f9b3a8 (diff) | |
| download | nginx-release-0.1.33.tar.gz nginx-release-0.1.33.zip | |
nginx-0.1.33-RELEASE importrelease-0.1.33
*) Bugfix: nginx could not be built with the --without-pcre parameter;
the bug had appeared in 0.1.29.
*) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one
level cause the bus fault on start up.
*) Bugfix: the HTTP protocol was specified in the HTTPS redirects.
*) Bugfix: if the "rewrite" directive used the captures inside the "if"
directive, then the 500 error code was returned.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_errno.h | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_time.c | 6 | ||||
| -rw-r--r-- | src/os/unix/ngx_time.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index 51d608bf4..310a1dc22 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -52,7 +52,7 @@ u_char *ngx_strerror_r(int err, u_char *errstr, size_t size); #else -/* Solaris has thread-safe strerror() */ +/* Solaris and Tru64 UNIX have thread-safe strerror() */ #define ngx_strerror_r(err, errstr, size) \ ngx_cpystrn(errstr, (u_char *) strerror(err), size) diff --git a/src/os/unix/ngx_time.c b/src/os/unix/ngx_time.c index 72137f952..1b1a56697 100644 --- a/src/os/unix/ngx_time.c +++ b/src/os/unix/ngx_time.c @@ -14,7 +14,7 @@ void ngx_localtime(ngx_tm_t *tm) time_t now; now = ngx_time(); - localtime_r(&now, tm); + (void) localtime_r(&now, tm); #else time_t now; @@ -37,7 +37,7 @@ void ngx_libc_localtime(struct tm *tm) time_t now; now = ngx_time(); - localtime_r(&now, tm); + (void) localtime_r(&now, tm); #else time_t now; @@ -57,7 +57,7 @@ void ngx_libc_gmtime(struct tm *tm) time_t now; now = ngx_time(); - gmtime_r(&now, tm); + (void) gmtime_r(&now, tm); #else time_t now; diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h index 6e5a38ae2..d3d176fda 100644 --- a/src/os/unix/ngx_time.h +++ b/src/os/unix/ngx_time.h @@ -57,9 +57,9 @@ void ngx_localtime(ngx_tm_t *tm); void ngx_libc_localtime(struct tm *tm); void ngx_libc_gmtime(struct tm *tm); -#define ngx_gettimeofday(tp) gettimeofday(tp, NULL); -#define ngx_msleep(ms) usleep(ms * 1000) -#define ngx_sleep(s) sleep(s) +#define ngx_gettimeofday(tp) (void) gettimeofday(tp, NULL); +#define ngx_msleep(ms) (void) usleep(ms * 1000) +#define ngx_sleep(s) (void) sleep(s) #endif /* _NGX_TIME_H_INCLUDED_ */ |