]> git.kaiwu.me - nginx.git/commitdiff
style fix: remove trailing spaces
authorIgor Sysoev <igor@sysoev.ru>
Mon, 9 Oct 2006 15:38:59 +0000 (15:38 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 9 Oct 2006 15:38:59 +0000 (15:38 +0000)
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

index 26fee9c58de147567a37c0eb4f4722172c118359..16e8d36d1c369fd36e0794ad0b9e134291725f5d 100644 (file)
@@ -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">
index 0334d44e08fdb36e2f6773cc8ae927a4cb35137f..740cf4dfd8e4956e4f46738b964ecf8d253dadb7 100644 (file)
@@ -498,7 +498,7 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
             wev->active = 0;
 
             if (revents & POLLIN) {
-    
+
                 if ((flags & NGX_POST_THREAD_EVENTS) && !rev->accept) {
                     rev->posted_ready = 1;
 
index a2fb4bd3690849f6536238d9c6bbd41666efa6bd..98df6c575f4f461e4914200a0253d4e83ff863ab 100644 (file)
@@ -61,7 +61,7 @@ static ngx_int_t ngx_http_browser_variable(ngx_http_request_t *r,
 
 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,
index daa52777b49db9b7ab650d5076d822956c558a7e..7fa736d809dd957d4f720e4c1c945e205fb6538a 100644 (file)
@@ -183,7 +183,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
     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)
     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));
index a73f2289c2ee655eb371f945655dd4d4ea3ba6a4..971dda6490aab67d3ad5bf258abe5a0399369418 100644 (file)
@@ -1,2 +1,2 @@
 # disable { PAUSE ] hwcap for Sun Studio 11
-hwcap_1 = OVERRIDE; 
+hwcap_1 = OVERRIDE;
index 8996864db31361dc208b6d97b9bc6863c70d69ba..45e4bad37e2145a39f8b39477dce29567480f7c4 100644 (file)
@@ -21,4 +21,4 @@ static char * nginx_xpm[] = {
 "        GGGGGGGGGGGGGGGG        ",
 "        GGGGGGGGGGGGGGGG        ",
 "                                "
-}; 
+};
index 6a8a6ea17be8c16eb0789822a4941ac8027f915d..2fa0445bded54e270611f56ab710e38af1cd6f71 100644 (file)
@@ -21,4 +21,4 @@ static char * nginx_xpm[] = {
 "        GGGGGGGGGGGGGGGG        ",
 "        GGGGGGGGGGGGGGGG        ",
 "                                "
-}; 
+};