From acbe1e8b817da2bb32d2db79a56748d829d84baa Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Wed, 17 May 2006 23:19:52 +0000
Subject: 0.5.1   - Fix problem with NTLM connection caching

---
 apache2x/Makefile.in    | 1 -
 apache2x/mod_httpauth.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'apache2x')

diff --git a/apache2x/Makefile.in b/apache2x/Makefile.in
index 625bc7d..2244be8 100644
--- a/apache2x/Makefile.in
+++ b/apache2x/Makefile.in
@@ -7,7 +7,6 @@ all: mod_httpauth.so
 
 mod_httpauth.so: mod_httpauth.c ../common/sock_any.c
 	@APXS@ -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
-	@SH_LINK@ -rpath $(libexecdir) -module -avoid-version  mod_httpauth.lo
 
 #   install the DSO file into the Apache installation
 #   and activate it in the Apache configuration
diff --git a/apache2x/mod_httpauth.c b/apache2x/mod_httpauth.c
index ff4494e..9e8a95a 100644
--- a/apache2x/mod_httpauth.c
+++ b/apache2x/mod_httpauth.c
@@ -624,7 +624,8 @@ int write_request(httpauth_context_t* ctx, request_rec* r)
     const apr_table_entry_t* elts;
 
     /* A unique per connection id */
-    snprintf(connid, sizeof(connid), "0x%X", (unsigned int)r->connection);
+    snprintf(connid, sizeof(connid), "0x%X-%X",
+             (unsigned int)r->connection, (unsigned int)r->connection->id);
     connid[sizeof(connid) - 1] = 0;
     snprintf(pidid, sizeof(pidid), "%d", (unsigned int)getpid());
     pidid[sizeof(pidid) - 1] = 0;
-- 
cgit v1.2.3