Jim Jagielski 1201dc30b1
Merge r1664709, r1697323 from trunk: ...
* Do not reset the retry timeout if the worker is in error at this stage even
if the connection to the backend was successful. It was likely set into
error by a different thread / process in parallel e.g. for a timeout or
bad status. We should respect this and should not continue with a connection
via this worker even if we got one.
* Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704835 13f79535-47bb-0310-9956-ffa450edef68
2015-09-23 12:35:57 +00:00
2015-02-24 06:22:22 +00:00
2015-02-24 06:22:22 +00:00
2002-01-29 15:27:30 +00:00
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:
2015-09-08 11:10:16 +00:00
2015-02-24 18:34:01 +00:00
2011-12-05 00:08:01 +00:00
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:
2015-09-08 11:10:16 +00:00
2013-07-10 20:26:29 +00:00
2015-02-24 18:34:01 +00:00
2007-02-08 13:46:14 +00:00
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:
2013-06-13 15:09:31 +00:00
1999-06-18 18:39:23 +00:00
2008-12-12 16:31:15 +00:00
2015-06-02 13:39:26 +00:00
2007-01-11 05:37:20 +00:00
2015-05-29 20:07:15 +00:00
2007-01-11 05:37:20 +00:00
2015-03-31 12:53:00 +00:00
2007-01-11 05:37:20 +00:00
2015-06-01 12:40:51 +00:00
2011-07-18 22:31:04 +00:00
2015-05-29 20:07:15 +00:00
2013-11-22 00:19:06 +00:00
2015-01-12 13:36:17 +00:00
2012-01-31 12:04:47 +00:00
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:
2015-09-08 11:10:16 +00:00
2007-01-11 05:37:20 +00:00
2015-09-16 13:34:11 +00:00
2007-01-11 05:37:20 +00:00
2015-05-29 20:07:15 +00:00
2009-12-01 02:24:31 +00:00
2015-06-02 13:40:41 +00:00
2015-03-27 20:44:55 +00:00
2015-09-05 17:04:34 +00:00
2007-01-11 05:37:20 +00:00
2015-04-15 17:50:46 +00:00
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:
2013-06-13 15:09:31 +00:00
2015-08-09 21:53:57 +00:00
2011-04-03 15:33:08 +00:00
2011-04-03 15:33:08 +00:00
2011-04-03 15:33:08 +00:00
2011-07-20 12:44:09 +00:00
2011-04-03 15:33:08 +00:00
2011-04-03 15:33:08 +00:00
2011-04-03 15:33:08 +00:00
2012-08-09 11:15:45 +00:00
2012-08-09 11:15:45 +00:00
2012-08-09 11:15:45 +00:00
2012-08-09 11:15:45 +00:00
2011-04-03 15:33:08 +00:00
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:
2013-06-13 15:09:31 +00:00
2015-09-23 12:35:57 +00:00
2012-09-24 09:49:55 +00:00
2014-06-03 12:54:00 +00:00
1201dc30b1