]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 803b1ac) | patch
Merge r546128, r550514 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 17 Jul 2007 17:12:58 +0000 (17:12 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 17 Jul 2007 17:12:58 +0000 (17:12 +0000)
commit01e993cd59104030eeeaecf63ee1c1f497dc8bc0
tree6e31efb5f20e2b9cb0b3d1337c99948ddd540c16tree | snapshot
parent803b1ac430714ebda34a7de334dba93a36f2e738commit | diff
Merge r546128, r550514 from trunk:

Arrange the proxy timeout behaviour.

Fix the timeout logic. The order is now:
1 - worker->timeout
2 - proxy_conf->timeout
3 - server->timeout.
ap_get_module_config() is not perfect by that is easy to port back to 2.2.x.

Submitted by: jfclere
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@556972 13f79535-47bb-0310-9956-ffa450edef68
STATUS diff | blob | blame | history
modules/proxy/proxy_util.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git