Permalink
Browse files

Revert "Fixes to stop PHP process from hanging"

This reverts commit a9dcb8f.
  • Loading branch information...
1 parent a9dcb8f commit da307e0e20659ba853708c240e89afcb0240fe3a @pstengel pstengel committed Apr 30, 2012
Showing with 4 additions and 6 deletions.
  1. +4 −6 mod_logcpu.c
View
10 mod_logcpu.c
@@ -75,19 +75,17 @@ static const char *log_cpu_elapsed(request_rec *r, char *a)
struct process_chain *pc = p->subprocesses;
if (pc && pc->proc) {
- while (apr_proc_wait(pc->proc, NULL, NULL, APR_NOWAIT) != APR_CHILD_DONE
- && !r->connection->aborted) {
- continue;
+ while (apr_proc_wait(pc->proc, NULL, NULL, APR_NOWAIT) != APR_CHILD_DONE) {
+ sleep(1);
}
}
apr_thread_mutex_lock(logcpu_cumulative_lock);
}
else {
apr_proc_t pr;
- while (apr_proc_wait_all_procs(&pr, NULL, NULL, APR_NOWAIT, NULL) != APR_CHILD_DONE
- && !r->connection->aborted) {
- continue;
+ while (apr_proc_wait_all_procs(&pr, NULL, NULL, APR_NOWAIT, NULL) != APR_CHILD_DONE) {
+ sleep(1);
}
}

0 comments on commit da307e0

Please sign in to comment.