nginx: src/http/ngx_http_request.c comparison

captures support in server_name

comparison

equal deleted inserted replaced

-:163114282d2c
+:2d34fba7cf06
 ngx_http_server_name_t  *sn;
 name.len = len;
 name.data = server;
+len = 0;
 sn = vn->regex;
 for (i = 0; i < vn->nregex; i++) {
-n = ngx_regex_exec(sn[i].regex, &name, NULL, 0);
+if (sn[i].captures && r->captures == NULL) {
+len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
+r->captures = ngx_palloc(r->pool, len);
+if (r->captures == NULL) {
+return NGX_ERROR;
+}
+if (server == buf) {
+server = ngx_pnalloc(r->pool, len);
+if (server == NULL) {
+return NGX_ERROR;
+}
+ngx_memcpy(server, buf, len);
+name.data = server;
+}
+}
+n = ngx_regex_exec(sn[i].regex, &name, r->captures, len);
 if (n == NGX_REGEX_NO_MATCHED) {
 continue;
 }
 }
 /* match */
 cscf = sn[i].core_srv_conf;
+r->ncaptures = len;
+r->captures_data = server;
 goto found;
 }
 }

Mercurial > hg > nginx