backout r2677 and fix ngx_strlcasestrn() again

This commit is contained in:
Igor Sysoev 2009-04-06 11:42:42 +00:00
parent 8d9e4c847d
commit d5ba36fdad

View File

@ -703,17 +703,13 @@ ngx_strlcasestrn(u_char *s1, u_char *last, u_char *s2, size_t n)
{ {
ngx_uint_t c1, c2; ngx_uint_t c1, c2;
if (s1 <= last) {
return NULL;
}
c2 = (ngx_uint_t) *s2++; c2 = (ngx_uint_t) *s2++;
c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
last -= n; last -= n;
do { do {
do { do {
if (s1 == last) { if (s1 >= last) {
return NULL; return NULL;
} }