Mercurial > hg > nginx
view src/os/unix/ngx_time.c @ 4723:68ac485abbba stable-1.2
Merge of r4654, r4672, r4684, r4685, r4692: resolver changes.
*) Resolver: fixed format specification.
Patch by Yichun Zhang (agentzh).
*) Support for IPv6 literals and an optional port in resolver.
*) Fixed crash in ngx_resolver_cleanup_tree().
If sending a DNS request fails with an error (e.g., when mistakenly
trying to send it to a local IP broadcast), such a request is not
deleted if there are clients waiting on it. However, it was still
erroneously removed from the queue. Later ngx_resolver_cleanup_tree()
attempted to remove it from the queue again that resulted in a NULL
pointer dereference.
*) When "resolver" is configured with a domain name, only the first
resolved address was used. Now all addresses will be used.
*) Fixed segfault with poll and resolver used.
Poll event method needs ngx_cycle->files to work, and use of
ngx_exit_cycle without files set caused null pointer dereference in
resolver's cleanup on udp socket close.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 02 Jul 2012 16:23:14 +0000 |
parents | d620f497c50f |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> /* * FreeBSD does not test /etc/localtime change, however, we can workaround it * by calling tzset() with TZ and then without TZ to update timezone. * The trick should work since FreeBSD 2.1.0. * * Linux does not test /etc/localtime change in localtime(), * but may stat("/etc/localtime") several times in every strftime(), * therefore we use it to update timezone. * * Solaris does not test /etc/TIMEZONE change too and no workaround available. */ void ngx_timezone_update(void) { #if (NGX_FREEBSD) if (getenv("TZ")) { return; } putenv("TZ=UTC"); tzset(); unsetenv("TZ"); tzset(); #elif (NGX_LINUX) time_t s; struct tm *t; char buf[4]; s = time(0); t = localtime(&s); strftime(buf, 4, "%H", t); #endif } void ngx_localtime(time_t s, ngx_tm_t *tm) { #if (NGX_HAVE_LOCALTIME_R) (void) localtime_r(&s, tm); #else ngx_tm_t *t; t = localtime(&s); *tm = *t; #endif tm->ngx_tm_mon++; tm->ngx_tm_year += 1900; } void ngx_libc_localtime(time_t s, struct tm *tm) { #if (NGX_HAVE_LOCALTIME_R) (void) localtime_r(&s, tm); #else struct tm *t; t = localtime(&s); *tm = *t; #endif } void ngx_libc_gmtime(time_t s, struct tm *tm) { #if (NGX_HAVE_LOCALTIME_R) (void) gmtime_r(&s, tm); #else struct tm *t; t = gmtime(&s); *tm = *t; #endif }