Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7448
Modified Files:
nss_engine_io.c
Log Message:
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.
Index: nss_engine_io.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_io.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nss_engine_io.c 17 Sep 2010 19:39:27 -0000 1.11
+++ nss_engine_io.c 24 Sep 2010 02:06:57 -0000 1.12
@@ -259,8 +259,7 @@
*/
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 @@
break;
}
+ PR_SetError(0, 0);
rc = PR_Read(inctx->filter_ctx->pssl, buf + bytes, wanted - bytes);
if (rc > 0) {
Show replies by date