Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7427

Browse Source
This commit is contained in:
Hakase
2018-12-12 12:53:04 +09:00
parent a8295ca677
commit 7ebc14b89c
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/ngx_http_core_module.c
+8
View File
@@ -2400,6 +2400,14 @@ ngx_http_subrequest(ngx_http_request_t *r,
sr->phase_handler = r->phase_handler;
sr->write_event_handler = ngx_http_core_run_phases;
#if (NGX_PCRE)
sr->ncaptures = r->ncaptures;
sr->captures = r->captures;
sr->captures_data = r->captures_data;
sr->realloc_captures = 1;
r->realloc_captures = 1;
#endif
ngx_http_update_location_config(sr);
}
src/http/ngx_http_request.h
+4
View File
@@ -499,6 +499,10 @@ struct ngx_http_request_s {
unsigned gzip_vary:1;
#endif
#if (NGX_PCRE)
unsigned realloc_captures:1;
#endif
unsigned proxy:1;
unsigned bypass_cache:1;
unsigned no_cache:1;
src/http/ngx_http_variables.c
+3 -1
View File
@@ -2504,7 +2504,9 @@ ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
if (re->ncaptures) {
len = cmcf->ncaptures;
if (r->captures == NULL) {
if (r->captures == NULL || r->realloc_captures) {
r->realloc_captures = 0;
r->captures = ngx_palloc(r->pool, len * sizeof(int));
if (r->captures == NULL) {
return NGX_ERROR;