From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 6 Apr 2009 11:42:42 +0000 (+0000)
Subject: backout r2677 and fix ngx_strlcasestrn() again
X-Git-Tag: release-0.7.50~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d5ba36fdadfced3a83304371e0d26641af3925d0;p=nginx.git

backout r2677 and fix ngx_strlcasestrn() again
---

diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 8f2a17159..9b63891a8 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -703,17 +703,13 @@ ngx_strlcasestrn(u_char *s1, u_char *last, u_char *s2, size_t n)
 {
     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;
             }