summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2015-02-16 15:15:11 +0300
committerAntony Dovgal <tony2001@php.net>2015-02-16 15:15:11 +0300
commitc4664d173160c967a31234e7ba79516ba847ef1e (patch)
treef52b33748fe311ec7b73053fbee4fade085251be
parent830998811112d60a9fe98c7e2b86250ccf75d6f4 (diff)
parent3664345abac75aabedfbca061b0b7db5915de085 (diff)
downloadphp-git-c4664d173160c967a31234e7ba79516ba847ef1e.tar.gz
Merge branch 'pull-request/995' into PHP-5.6
* pull-request/995: fix bug #68822 (request time is reset too early)
-rw-r--r--sapi/fpm/fpm/fpm_request.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
index bf431a08d0..ed7e7a8890 100644
--- a/sapi/fpm/fpm/fpm_request.c
+++ b/sapi/fpm/fpm/fpm_request.c
@@ -221,8 +221,6 @@ void fpm_request_finished() /* {{{ */
proc->request_stage = FPM_REQUEST_FINISHED;
proc->tv = now;
- memset(&proc->accepted, 0, sizeof(proc->accepted));
- proc->accepted_epoch = 0;
fpm_scoreboard_proc_release(proc);
}
/* }}} */