Merge r697362 from trunk:

For timeouts, behave as before and not drop.
Submitted by: Adam Woodworth <mirkperl gmail.com>
Reviewed by: jim, rpluem, covener



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