diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-04-06 11:42:42 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-06 11:42:42 +0000 |
commit | d5ba36fdadfced3a83304371e0d26641af3925d0 (patch) | |
tree | 568cb859f44fa877426a8c899ec97d5fe98979fa /src/core/ngx_string.c | |
parent | 8d9e4c847d389b1af5d7b95b5bbbb9ed86a3dea4 (diff) | |
download | nginx-d5ba36fdadfced3a83304371e0d26641af3925d0.tar.gz nginx-d5ba36fdadfced3a83304371e0d26641af3925d0.zip |
backout r2677 and fix ngx_strlcasestrn() again
Diffstat (limited to 'src/core/ngx_string.c')
-rw-r--r-- | src/core/ngx_string.c | 6 |
1 files changed, 1 insertions, 5 deletions
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; } |