Mercurial > hg > nginx
changeset 754:4ac89c5aa10d
style fix: remove trailing spaces
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 09 Oct 2006 15:38:59 +0000 |
| parents | af72ac9c3dbf |
| children | 63b9dc652c3d |
| files | docs/xml/nginx/changes.xml src/event/modules/ngx_eventport_module.c src/http/modules/ngx_http_browser_module.c src/http/modules/ngx_http_flv_module.c src/os/unix/ngx_sunpro_x86.map src/os/win32/nginx_icon16.xpm src/os/win32/nginx_tray.xpm |
| diffstat | 7 files changed, 39 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -9,6 +9,38 @@ <title lang="en">nginx changelog</title> +<changes ver="0.4.7" date="10.10.2006"> + +<change type="feature"> +<para lang="ru"> +модуль ngx_http_flv_module. +</para> +<para lang="en"> +the ngx_http_flv_module. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +модуль ngx_http_charset_module поддерживает переменные. +</para> +<para lang="en"> +the ngx_http_charset_module supports the variables. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не запускался на 64-битных платформах, отличной от amd64, sparc64 и ppc64. +</para> +<para lang="en"> +nginx did not run on 64-bit platforms except amd64, sparc64, and ppc64. +</para> +</change> + +</changes> + + <changes ver="0.4.6" date="06.10.2006"> <change type="bugfix">
--- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -498,7 +498,7 @@ ngx_eventport_process_events(ngx_cycle_t wev->active = 0; if (revents & POLLIN) { - + if ((flags & NGX_POST_THREAD_EVENTS) && !rev->accept) { rev->posted_ready = 1;
--- a/src/http/modules/ngx_http_browser_module.c +++ b/src/http/modules/ngx_http_browser_module.c @@ -61,7 +61,7 @@ static ngx_int_t ngx_http_browser_variab static ngx_uint_t ngx_http_browser(ngx_http_request_t *r, ngx_http_browser_conf_t *cf); - + static ngx_int_t ngx_http_browser_add_variable(ngx_conf_t *cf); static void *ngx_http_browser_create_conf(ngx_conf_t *cf); static char *ngx_http_browser_merge_conf(ngx_conf_t *cf, void *parent,
--- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -183,7 +183,7 @@ ngx_http_flv_handler(ngx_http_request_t log->action = "sending flv to client"; cln->handler = ngx_pool_cleanup_file; - clnf = cln->data; + clnf = cln->data; clnf->fd = fd; clnf->name = path.data; @@ -194,7 +194,7 @@ ngx_http_flv_handler(ngx_http_request_t r->headers_out.last_modified_time = ngx_file_mtime(&fi); if (ngx_http_set_content_type(r) != NGX_OK) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
--- a/src/os/unix/ngx_sunpro_x86.map +++ b/src/os/unix/ngx_sunpro_x86.map @@ -1,2 +1,2 @@ # disable { PAUSE ] hwcap for Sun Studio 11 -hwcap_1 = OVERRIDE; +hwcap_1 = OVERRIDE;