Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 669B19F58 for ; Wed, 9 Nov 2011 00:29:14 +0000 (UTC) Received: (qmail 70507 invoked by uid 500); 9 Nov 2011 00:29:13 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 70431 invoked by uid 500); 9 Nov 2011 00:29:13 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 70400 invoked by uid 99); 9 Nov 2011 00:29:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 00:29:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 00:29:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E3E2238897F; Wed, 9 Nov 2011 00:28:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199565 - /httpd/httpd/trunk/modules/aaa/mod_authn_socache.c Date: Wed, 09 Nov 2011 00:28:51 -0000 To: cvs@httpd.apache.org From: niq@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111109002851.8E3E2238897F@eris.apache.org> Author: niq Date: Wed Nov 9 00:28:51 2011 New Revision: 1199565 URL: http://svn.apache.org/viewvc?rev=1199565&view=rev Log: mod_authn_socache: fix namespacing issue http://marc.info/?l=apache-httpd-dev&m=131823772714741&w=2 Modified: httpd/httpd/trunk/modules/aaa/mod_authn_socache.c Modified: httpd/httpd/trunk/modules/aaa/mod_authn_socache.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_socache.c?rev=1199565&r1=1199564&r2=1199565&view=diff ============================================================================== --- httpd/httpd/trunk/modules/aaa/mod_authn_socache.c (original) +++ httpd/httpd/trunk/modules/aaa/mod_authn_socache.c Wed Nov 9 00:28:51 2011 @@ -232,7 +232,11 @@ static const char *construct_key(request if (!strcmp(context, "directory")) { /* FIXME: are we at risk of this blowing up? */ char *slash = strrchr(r->uri, '/'); - context = apr_pstrndup(r->pool, r->uri, slash - r->uri + 1); + context = apr_palloc(r->pool, slash - r->uri + + strlen(r->server->server_hostname) + 2); + strcpy(context, r->server->server_hostname); + strcat(context, ":"); + strncat(context, r->uri, slash - r->uri); } else if (!strcmp(context, "server")) { context = r->server->server_hostname;