1 files changed, 18 insertions, 10 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index f7d9906a8..850e64e75 100644
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -561,25 +561,33 @@ ngx_http_charset_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 static ngx_uint_t
 ngx_http_charset_recode(ngx_buf_t *b, u_char *table)
 {
-    u_char  *p;
+    u_char  *p, *last;
 
-    for (p = b->pos; p < b->last; p++) {
+    last = b->last;
 
-        if (*p == table[*p]) {
-            continue;
+    for (p = b->pos; p < last; p++) {
+
+        if (*p != table[*p]) {
+            goto recode;
         }
+    }
+
+    return 0;
 
-        while (p < b->last) {
+recode:
+
+    do {
+        if (*p != table[*p]) {
             *p = table[*p];
-            p++;
         }
 
-        b->in_file = 0;
+        p++;
 
-        return 1;
-    }
+    } while (p < last);
 
-    return 0;
+    b->in_file = 0;
+
+    return 1;
 }