Merge in changes from http://svn.apache.org/viewvc?view=rev&revision=161958

The issue was that mod_ssl wasn't always picking up ssl-unclean-shutdown
settings. This isn't an issue for mod_nss since it doesn't support
separate shutdown modes, but this does simplify the code a bit.

* mod_nss.h: Remove nss_hook_Translate.

* nss_engine_kernel.c
     (nss_hook_ReadReq): Merge in nss_hook_Translate.
     (nss_hook_Translate): Remove.

* mod_nss.c (nss_register_hooks): Ensure that _ReadReq
  hook runs after mod_setenvif.c; don't register translate_name hook.

1 files changed, 6 insertions, 12 deletions

diff --git a/nss_engine_kernel.c b/nss_engine_kernel.c
index b8de991..9443896 100644
--- a/nss_engine_kernel.c
+++ b/nss_engine_kernel.c
@@ -23,6 +23,7 @@ static void HandshakeDone(PRFileDesc *fd, void *doneflag);
 int nss_hook_ReadReq(request_rec *r)
 {
     SSLConnRec *sslconn = myConnConfig(r->connection);
+    PRFileDesc *ssl = sslconn ? sslconn->ssl : NULL;
 
     if (!sslconn) {
         return DECLINED;
@@ -62,19 +63,13 @@ int nss_hook_ReadReq(request_rec *r)
         return HTTP_BAD_REQUEST;
     }
 
-    return DECLINED;
-}
-
-/* 
- *  URL Translation Handler
- */
-int nss_hook_Translate(request_rec *r)
-{
-    SSLConnRec *sslconn = myConnConfig(r->connection);
- 
-    if (!(sslconn && sslconn->ssl)) {
+    /* Get the SSL connection structure and perform the
+     * delayed interlinking from SSL back to request_rec
+     */
+    if (!ssl) {
         return DECLINED; 
     }
+
     /*
      * Log information about incoming HTTPS requests
      */
@@ -92,7 +87,6 @@ int nss_hook_Translate(request_rec *r)
     return DECLINED;
 }
 
-
 /*
  *  Access Handler
  */