r1290, r1291 merge:

style fixes

diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 9fab59bf7b1b94ffbe232141ff0f70e593ee0aa0..5539f61952f2efb3e6f30942b3a76f4099dd415b 100644 (file)
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -239,9 +239,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
 
 #if !(NGX_WIN32)
 
-    if (ngx_change_file_access(temp->data, dlcf->access)
-        == NGX_FILE_ERROR)
-    {
+    if (ngx_change_file_access(temp->data, dlcf->access) == NGX_FILE_ERROR) {
         err = ngx_errno;
         not_found = NGX_HTTP_INTERNAL_SERVER_ERROR;
         failed = ngx_change_file_access_n;

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index bfdc8e4430be356b7690bbdd13b44ade92bfb834..494f484166bdc86fc2ad1aedf35c65ce221ff3ec 100644 (file)
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -88,6 +88,7 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         }
 
         post_handler(r);
+
         return NGX_OK;
     }