Merge r1092076, r1100513:

Try to prevent a single long request marking a worker in error.

Submitted by: jfclere
Reviewd by: jfclere, rjung, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1227298 13f79535-47bb-0310-9956-ffa450edef68