From aa8286101a57f11f2c1f9b5bf2d7ec121e74beea Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 9 Feb 2005 14:31:07 +0000 Subject: nginx-0.1.18-RELEASE import *) Workaround: the default values of the devpoll_events and the devpoll_changes directives changed from 512 to 32 to be compatible with Solaris 10. *) Bugfix: the proxy_set_x_var and fastcgi_set_var directives were not inherited. *) Bugfix: in the redirect rewrite directive the arguments were concatenated with URI by the "&" rather than the "?". *) Bugfix: the lines without trailing ";" in the file being included by the ngx_http_geo_module were silently ignored. *) Feature: the ngx_http_stub_status_module. *) Bugfix: the unknown log format in the access_log directive caused the segmentation fault. *) Feature: the new "document_root" parameter of the fastcgi_params directive. *) Feature: the fastcgi_redirect_errors directive. *) Feature: the new "break" modifier of the "rewrite" directive allows to stop the rewrite/location cycle and sets the current configuration to the request. --- src/event/modules/ngx_devpoll_module.c | 4 ++-- src/event/modules/ngx_select_module.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/event/modules') diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c index aa61df7de..a9c60c46e 100644 --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -587,8 +587,8 @@ static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf) { ngx_devpoll_conf_t *dpcf = conf; - ngx_conf_init_unsigned_value(dpcf->changes, 512); - ngx_conf_init_unsigned_value(dpcf->events, 512); + ngx_conf_init_unsigned_value(dpcf->changes, 32); + ngx_conf_init_unsigned_value(dpcf->events, 32); return NGX_CONF_OK; } diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index 0554ee95f..623e13c16 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -347,8 +347,15 @@ static ngx_int_t ngx_select_process_events(ngx_cycle_t *cycle) work_read_fd_set = master_read_fd_set; work_write_fd_set = master_write_fd_set; +#if 1 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "select read fd_set: %08Xd", *(int *) &work_read_fd_set); + /* + * (void *) disables "dereferencing type-punned + * pointer will break strict-aliasing rules + */ + "select read fd_set: %08Xd", + *(int *) (void *) &work_read_fd_set); +#endif #if (NGX_WIN32) ready = select(0, &work_read_fd_set, &work_write_fd_set, NULL, tp); -- cgit