diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_string.c | 4 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index c976424bd..a723d2da0 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 007048 -#define NGINX_VERSION "0.7.48" +#define nginx_version 007049 +#define NGINX_VERSION "0.7.49" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index fbde1c2ce..8f2a17159 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -703,6 +703,10 @@ 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; diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 58c149c8a..5f0a6dcf0 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.7.48'; +our $VERSION = '0.7.49'; require XSLoader; XSLoader::load('nginx', $VERSION); |