commit df3254aa49c80b350ff4fa2eb50baf3cafbed71c
author Igor Sysoev <igor@sysoev.ru> Wed Jan 11 15:26:57 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Jan 11 15:26:57 2006 +0000
tree 15a72baf5205f698354f529e4ba2d5846b558c4a
parent 04ebcd942969bc479b4cc680eab6bf01f488f12f

nginx-0.3.20-RELEASE import

    *) Bugfix: in SSI handling.

    *) Bugfix: the ngx_http_memcached_module did not support the keys in
       the "/usr?args" form.

src/http/modules/ngx_http_static_module.c

diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index ed360fa..42cc676 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -244,7 +244,7 @@
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (r->main != r && ngx_file_size(&fi) == 0) {
+    if (r != r->main && ngx_file_size(&fi) == 0) {
         return ngx_http_send_header(r);
     }
 
@@ -272,7 +272,7 @@
     b->file_last = ngx_file_size(&fi);
 
     b->in_file = b->file_last ? 1: 0;
-    b->last_buf = (r->main == r) ? 1: 0;
+    b->last_buf = (r == r->main) ? 1: 0;
     b->last_in_chain = 1;
 
     b->file->fd = fd;