summaryrefslogtreecommitdiff
path: root/src/http/ngx_http_request.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-03-11 13:17:28 +0000
committerJonathan Kolb <jon@b0g.us>2009-03-11 13:17:28 +0000
commitd3c9e5f56459032d10c0c86e04472fc97621999f (patch)
treea5d1e2c77e1fdc0488f988a72e1105b9f2707005 /src/http/ngx_http_request.c
parent8b60224feb810a5f021dd1ba9bbd1ac69f8fbe67 (diff)
downloadnginx-d3c9e5f56459032d10c0c86e04472fc97621999f.tar.gz
Changes with nginx 0.7.41 11 Mar 2009v0.7.41
*) Bugfix: a segmentation fault might occur in worker process, if a "server_name" or a "location" directives had captures in regular expressions; the issue had appeared in 0.7.40. Thanks to Vladimir Sopot.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r--src/http/ngx_http_request.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 95a392a82..c018d6868 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1662,9 +1662,9 @@ ngx_http_find_virtual_server(ngx_http_request_t *r, u_char *host, size_t len)
if (sn[i].captures && r->captures == NULL) {
- ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
+ ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
- r->captures = ngx_palloc(r->pool, ncaptures);
+ r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int));
if (r->captures == NULL) {
return NGX_ERROR;
}