From a19ed3eddd136a51a06e344f3f677c0e31c1a284 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 6 Dec 2006 14:17:42 +0000 Subject: [PATCH] fix when last htpasswd line has no CR or LF --- src/http/modules/ngx_http_auth_basic_module.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c index 5a4f9d823..d021ef83e 100644 --- a/src/http/modules/ngx_http_auth_basic_module.c +++ b/src/http/modules/ngx_http_auth_basic_module.c @@ -154,6 +154,8 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) offset = 0; for ( ;; ) { + i = left; + n = ngx_read_file(&file, buf + left, NGX_HTTP_AUTH_BUF_SIZE - left, offset); @@ -228,6 +230,18 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) ngx_http_auth_basic_close(&file); + if (state == sw_passwd) { + pwd.len = i - passwd; + pwd.data = ngx_palloc(r->pool, pwd.len + 1); + if (pwd.data == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + ngx_cpystrn(pwd.data, &buf[passwd], pwd.len + 1); + + return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, &alcf->realm); + } + return ngx_http_auth_basic_set_realm(r, &alcf->realm); }