]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2130fc6) | patch
Merge r1524368, r1524388 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 9 Jan 2014 14:28:39 +0000 (14:28 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 9 Jan 2014 14:28:39 +0000 (14:28 +0000)
commitd5c6fa00319a04d73c46ba7381d3f3b5846e9810
tree876ecb1e144184ae59054ec97cf3dba23cb4daa5tree | snapshot
parent2130fc60935c8723a8411bde7fde406ac53afd97commit | diff
Merge r1524368, r1524388 from trunk:

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Document r1524368 in CHANGES.

Submitted by: jkaluza
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556815 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | history
STATUS diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.