Merge branch 'pull-request/995' into PHP-5.6

tony2001 · tony2001 · commit c4664d173160 · 2015-02-16T15:15:11.000+03:00
* pull-request/995:
  fix bug #68822 (request time is reset too early)
diff --git 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);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,6 @@ void fpm_request_finished() /* {{{ */`
`221`	`221`
`222`	`222`	`proc->request_stage = FPM_REQUEST_FINISHED;`
`223`	`223`	`proc->tv = now;`
`224`		`- memset(&proc->accepted, 0, sizeof(proc->accepted));`
`225`		`- proc->accepted_epoch = 0;`
`226`	`224`	`fpm_scoreboard_proc_release(proc);`
`227`	`225`	`}`
`228`	`226`	`/* }}} */`