From: Igor Sysoev Date: Fri, 13 Jul 2007 10:47:26 +0000 (+0000) Subject: r1290, r1291 merge: X-Git-Tag: release-0.5.28~3 X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=df6115741171e98a573685b15b098d011610adc0;p=nginx.git 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 9fab59bf7..5539f6195 100644 --- 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 bfdc8e443..494f48416 100644 --- 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; }