summaryrefslogtreecommitdiff
path: root/context.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-02-22 01:09:12 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-02-22 01:09:12 +0000
commit8fb9cce2ff815627d3bb41281dbb4c67c240f283 (patch)
tree6c900775ce3b0423330047b250d653d2fad787b8 /context.c
parent1f89a666e3d8a4c37bde40615cdb08cad7fbd422 (diff)
Diffstat (limited to 'context.c')
-rw-r--r--context.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/context.c b/context.c
index c2192640a119..b53b0a08a1c7 100644
--- a/context.c
+++ b/context.c
@@ -285,6 +285,12 @@ apr_status_t serf_context_run(
### look at the potential return codes. map to our defined
### return values? ...
*/
+
+ /* Use the strict documented error for poll timeouts, to allow proper
+ handling of the other timeout types when returned from
+ serf_event_trigger */
+ if (APR_STATUS_IS_TIMEUP(status))
+ return APR_TIMEUP; /* Return the documented error */
return status;
}