[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 111/156: Fix endless read loop in some situations when handling POST data (#620856)

[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 cb69869147f2618d011bfe821a330909d330612e
Author: rcritten <>
Date:   Fri Sep 17 19:39:27 2010 +0000

    Fix endless read loop in some situations when handling POST data (#620856)
    
    This was discovered in the dogtag TPS subsystem. I haven't been able to
    duplicate it outside of that but it is trivial inside. This seems to fix
    it and brings the code closer to what mod_ssl does here as well.
---
 nss_engine_io.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nss_engine_io.c b/nss_engine_io.c
index 78d3827..87dc195 100644
--- a/nss_engine_io.c
+++ b/nss_engine_io.c
@@ -259,7 +259,8 @@ 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))) {
-            PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
+            nspr_filter_out_ctx_t *outctx = filter_ctx->outctx;
+            inctx->rc = outctx->rc;
             return -1;
         }
 

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