Resolves: 241936

Bring in some updates based on diffs from 2.0.59 to 2.2.4

- Do explicit TRUE/FALSE tests with sc->enabled to see if SSL is enabled.
  Don't depend on the fact that TRUE == 1
- Remove some dead code
- Minor update to the buffer code that buffers POST data during a
  renegotation
- Optimize setting environment variables by using a switch statement.

1 files changed, 3 insertions, 3 deletions

diff --git a/nss_engine_kernel.c b/nss_engine_kernel.c
index 0e5b8ad..ae56cf2 100644
--- a/nss_engine_kernel.c
+++ b/nss_engine_kernel.c
@@ -130,7 +130,7 @@ int nss_hook_Access(request_rec *r)
      * no further access control checks are relevant. The test for
      * sc->enabled is probably strictly unnecessary
      */
-    if (!(sc->enabled || !ssl)) {
+    if (!((sc->enabled == TRUE) || !ssl)) {
         return DECLINED;
     }
 
@@ -619,7 +619,7 @@ int nss_hook_UserCheck(request_rec *r)
      * - ssl not enabled
      * - client did not present a certificate
      */
-    if (!(sc->enabled && sslconn && sslconn->ssl && sslconn->client_cert) ||
+    if (!((sc->enabled == TRUE) && sslconn && sslconn->ssl && sslconn->client_cert) ||
         !(dc->nOptions & SSL_OPT_FAKEBASICAUTH) || r->user)
     {
         return DECLINED;
@@ -781,7 +781,7 @@ int nss_hook_Fixup(request_rec *r)
     /*
      * Check to see if SSL is on
      */
-    if (!(sc->enabled && sslconn && (ssl = sslconn->ssl))) {
+    if (!((sc->enabled == TRUE) && sslconn && (ssl = sslconn->ssl))) {
         return DECLINED;
     }