diff options
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | poll/unix/z_asio.c | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes for APR 2.0.0 + *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return + "EDC8102I Operation would block" under load. + [Pat Odonnell patod us.ibm.com ] + *) apr_escape: Correctly calculate the size of the returned string in apr_escape_path and set the correct return value in case we actually escape the string. [<aduryagin gmail.com>] PR 57230. diff --git a/poll/unix/z_asio.c b/poll/unix/z_asio.c index ce158d316..d2df69638 100644 --- a/poll/unix/z_asio.c +++ b/poll/unix/z_asio.c @@ -379,6 +379,7 @@ static apr_status_t asio_pollset_add(apr_pollset_t *pollset, APR_RING_REMOVE(elem, link); DBG1(3, "used recycled memory at %08p\n", elem); elem->state = ASIO_INIT; + elem->a.aio_cflags = 0; } else { elem = (asio_elem_t *) apr_pcalloc(pollset->pool, sizeof(asio_elem_t)); @@ -659,6 +660,7 @@ static apr_status_t asio_pollset_poll(apr_pollset_t *pollset, if (ret == 1) { DBG(4, "asyncio() completed inline\n"); /* it's ready now */ + elem->state = ASIO_COMPLETE; APR_RING_INSERT_TAIL(&(priv->ready_ring), elem, asio_elem_t, link); } |