[mod_nss/f13/master] - Fix hang when handling large POST under some conditions (#620856) - Remove file requires on libnss

[rcritten]

commit 1e5e2b3feb7f31625c3ff09847a2fef50762d639
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Fri Sep 17 16:05:20 2010 -0400

    - Fix hang when handling large POST under some conditions (#620856)
    - Remove file requires on libnssckbi.so (requested by svidal)

 mod_nss-wouldblock.patch |    5 +++--
 mod_nss.spec             |    8 +++++---
 2 files changed, 8 insertions(+), 5 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 d618e8e..57e7b4a 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -1,6 +1,6 @@
 Name: mod_nss
 Version: 1.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -12,8 +12,6 @@ BuildRequires: httpd-devel, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires(pre): httpd
 Requires: nss >= 3.12.6
-# Add a files Requires on this in case the nss package moves it again
-Requires: %{_libdir}/libnssckbi.so
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
 Patch3: mod_nss-wouldblock.patch
@@ -120,6 +118,10 @@ fi
 %{_sbindir}/gencert
 
 %changelog
+* Fri Sep 17 2010 Rob Crittenden <rcritten at redhat.com> - 1.0.8-7
+- Fix hang when handling large POST under some conditions (#620856)
+- Remove file requires on libnssckbi.so (requested by svidal)
+
 * Fri May 14 2010 Rob Crittenden <rcritten at redhat.com> - 1.0.8-6
 - Ignore SIGHUP in nss_pcache (#591889).