[mod_nss] Fix hang when handling large POST under some conditions (#620856)
rcritten
rcritten at fedoraproject.org
Fri Sep 17 20:25:08 UTC 2010
commit 8c652c6b45ac17227f0933022a2691a358efc6b3
Author: Rob Crittenden <rcritten at redhat.com>
Date: Fri Sep 17 16:24:58 2010 -0400
Fix hang when handling large POST under some conditions (#620856)
mod_nss-wouldblock.patch | 5 +++--
mod_nss.spec | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/mod_nss-wouldblock.patch b/mod_nss-wouldblock.patch
index 405b67a..947133d 100644
--- a/mod_nss-wouldblock.patch
+++ b/mod_nss-wouldblock.patch
@@ -1,11 +1,12 @@
--- mod_nss-1.0.3.orig/nss_engine_io.c 2006-04-07 16:17:12.000000000 -0400
+++ mod_nss-1.0.3/nss_engine_io.c 2009-02-17 22:51:44.000000000 -0500
-@@ -259,7 +259,8 @@
+@@ -259,7 +259,9 @@
*/
if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)
|| (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) {
- return 0;
-+ PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
++ nspr_filter_out_ctx_t *outctx = filter_ctx->outctx;
++ inctx->rc = outctx->rc;
+ return -1;
}
diff --git a/mod_nss.spec b/mod_nss.spec
index a0a8cbe..68bdabf 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -1,6 +1,6 @@
Name: mod_nss
Version: 1.0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: SSL/TLS module for the Apache HTTP server
Group: System Environment/Daemons
License: ASL 2.0
@@ -118,6 +118,9 @@ fi
%{_sbindir}/gencert
%changelog
+* Fri Sep 17 2010 Rob Crittenden <rcritten at redhat.com> - 1.0.8-8
+- Fix hang when handling large POST under some conditions (#620856)
+
* Tue Jun 22 2010 Rob Crittenden <rcritten at redhat.com> - 1.0.8-7
- Remove file Requires on libnssckbi.so (#601939)
More information about the scm-commits
mailing list