~ubuntu-branches/ubuntu/maverick/nginx/maverick

« back to all changes in this revision

Viewing changes to src/event/modules/ngx_rtsig_module.c

Committer: Daniel Holbach
Date: 2010-07-22 07:45:20 UTC
mfrom: (1.1.17 upstream)
Revision ID: daniel.holbach@canonical.com-20100722074520-lzfoz7cctw91gik7

Merging shared upstream rev into target branch.

files modified:
CHANGES

CHANGES.ru

auto/cc/conf

auto/cc/gcc

auto/feature

auto/lib/openssl/conf

auto/lib/openssl/make

auto/lib/openssl/makefile.bcc

auto/lib/openssl/makefile.msvc

auto/lib/zlib/make

auto/modules

auto/unix

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_open_file_cache.c

src/core/ngx_string.c

src/core/ngx_times.c

src/core/ngx_times.h

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_poll_module.c

src/event/modules/ngx_rtsig_module.c

src/event/modules/ngx_select_module.c

src/event/modules/ngx_win32_select_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_chunked_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_flv_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_geoip_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_static_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/nginx.xs

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_copy_filter_module.c

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_proxy_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process_cycle.c

Show diffs side-by-side

added added

removed removed

src/event/modules/ngx_rtsig_module.c

323

"rtsig signo:%d", signo);

324

325

if (flags & NGX_UPDATE_TIME) {

326

ngx_time_update(0, 0);

326

ngx_time_update();

327

}

328

329

if (err == NGX_EAGAIN) {

349

signo, si.si_fd, si.si_band);

350

351

if (flags & NGX_UPDATE_TIME) {

352

ngx_time_update(0, 0);

352

ngx_time_update();

353

}

354

355

rtscf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_rtsig_module);

419

420

} else if (signo == SIGALRM) {

421

422

ngx_time_update(0, 0);

422

ngx_time_update();

423

424

return NGX_OK;

425

671

}

672

673

if (flags & NGX_UPDATE_TIME) {

674

ngx_time_update(0, 0);

674

ngx_time_update();

675

}

676

677

ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,

Older »