Skip to content

Commit

Permalink
revert a bad commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
lizi committed Mar 28, 2012
1 parent 4670de6 commit fe9e29f
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/http/ngx_http_core_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,6 @@ ngx_http_subrequest(ngx_http_request_t *r,
ngx_connection_t *c;
ngx_http_request_t *sr;
ngx_http_core_srv_conf_t *cscf;
ngx_http_core_main_conf_t *cmcf;
ngx_http_postponed_request_t *pr, *p;

r->main->subrequests--;
Expand Down Expand Up @@ -2454,14 +2453,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
c->data = sr;
}

cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);

/* avoid variables operation on one request may affect others */
sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
* sizeof(ngx_http_variable_value_t));
if (sr->variables == NULL) {
return NGX_ERROR;
}
sr->variables = r->variables;

sr->log_handler = r->log_handler;

Expand Down

0 comments on commit fe9e29f

Please sign in to comment.