Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 72830 invoked from network); 13 Jun 2007 02:19:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jun 2007 02:19:21 -0000 Received: (qmail 71588 invoked by uid 500); 13 Jun 2007 02:19:24 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 71549 invoked by uid 500); 13 Jun 2007 02:19:24 -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 71536 invoked by uid 99); 13 Jun 2007 02:19:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 19:19:24 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 19:19:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D515E1A981A; Tue, 12 Jun 2007 19:18:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r546708 - /httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c Date: Wed, 13 Jun 2007 02:18:59 -0000 To: cvs@httpd.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070613021859.D515E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pquerna Date: Tue Jun 12 19:18:59 2007 New Revision: 546708 URL: http://svn.apache.org/viewvc?view=rev&rev=546708 Log: Improve mc_session_id2sz as suggested by Rüdiger. Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c?view=diff&rev=546708&r1=546707&r2=546708 ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_scache_memcache.c Tue Jun 12 19:18:59 2007 @@ -168,13 +168,16 @@ { char *cp; int n; - + int maxlen = (strsize - MC_TAG_LEN)/2; + cp = apr_cpystrn(str, MC_TAG, MC_TAG_LEN); - for (n = 0; n < idlen && n < (MC_KEY_LEN - MC_TAG_LEN); n++) { - apr_snprintf(cp, strsize - (cp-str), "%02X", id[n]); + for (n = 0; n < idlen && n < maxlen; n++) { + apr_snprintf(cp, 2, "%02X", id[n]); cp += 2; } + *cp = '\0'; + return str; }