You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2021/11/10 14:22:16 UTC
svn commit: r1894918 - in /apr/apr/branches/1.7.x: ./ poll/unix/wakeup.c
Author: ylavic
Date: Wed Nov 10 14:22:16 2021
New Revision: 1894918
URL: http://svn.apache.org/viewvc?rev=1894918&view=rev
Log:
Merge r1894917 from trunk:
Follow up to r1894914: non-blocking wakeup pipe reads on Windows too.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/poll/unix/wakeup.c
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1894917
Modified: apr/apr/branches/1.7.x/poll/unix/wakeup.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/poll/unix/wakeup.c?rev=1894918&r1=1894917&r2=1894918&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/poll/unix/wakeup.c (original)
+++ apr/apr/branches/1.7.x/poll/unix/wakeup.c Wed Nov 10 14:22:16 2021
@@ -36,6 +36,9 @@ apr_status_t apr_poll_create_wakeup_pipe
pool)) != APR_SUCCESS)
return rv;
+ /* Read end of the pipe is non-blocking */
+ apr_file_pipe_timeout_set(wakeup_pipe[0], 0);
+
pfd->reqevents = APR_POLLIN;
pfd->desc_type = APR_POLL_FILE;
pfd->desc.f = wakeup_pipe[0];
@@ -80,6 +83,7 @@ apr_status_t apr_poll_create_wakeup_pipe
{
apr_status_t rv;
+ /* Read end of the pipe is non-blocking */
if ((rv = apr_file_pipe_create_ex(&wakeup_pipe[0], &wakeup_pipe[1],
APR_WRITE_BLOCK,
pool)) != APR_SUCCESS)