[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 114/156: Revert PR_WOULD_BLOCK change and reset the NSPR error value before callling PR_Read().

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit cb1d3ff69a065f176c6d953592287c0f8c6d4656
Author: rcritten <>
Date:   Fri Sep 24 02:06:57 2010 +0000

    Revert PR_WOULD_BLOCK change and reset the NSPR error value before callling
    PR_Read().
    
    In testing with TPS from dogtag this really seems to fix #620856 this
    time.
---
 nss_engine_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nss_engine_io.c b/nss_engine_io.c
index 87dc195..e31bfc1 100644
--- a/nss_engine_io.c
+++ b/nss_engine_io.c
@@ -259,8 +259,7 @@ nspr_filter_in_read(PRFileDesc *fd, void *in, PRInt32 inlen)
          */
         if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)
                || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) {
-            nspr_filter_out_ctx_t *outctx = filter_ctx->outctx;
-            inctx->rc = outctx->rc;
+            PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
             return -1;
         }
 
@@ -350,6 +349,7 @@ static apr_status_t nss_io_input_read(nspr_filter_in_ctx_t *inctx,
             break;
         }
 
+        PR_SetError(0, 0);
         rc = PR_Read(inctx->filter_ctx->pssl, buf + bytes, wanted - bytes);
 
         if (rc > 0) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git