# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1239018162 0
# Node ID 82e3946062be9266188ee6fcc3d44ee80e96fcda
# Parent  0a209cac352a3d96cd64dc4ea1e349a58bc228c1
backout r2677 and fix ngx_strlcasestrn() again

diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -703,17 +703,13 @@ ngx_strlcasestrn(u_char *s1, u_char *las
 {
     ngx_uint_t  c1, c2;
 
-    if (s1 <= last) {
-        return NULL;
-    }
-
     c2 = (ngx_uint_t) *s2++;
     c2  = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
     last -= n;
 
     do {
         do {
-            if (s1 == last) {
+            if (s1 >= last) {
                 return NULL;
             }