Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 56563 invoked from network); 6 Jun 2010 19:26:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Jun 2010 19:26:16 -0000 Received: (qmail 52729 invoked by uid 500); 6 Jun 2010 19:26:16 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 52679 invoked by uid 500); 6 Jun 2010 19:26:16 -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 52672 invoked by uid 99); 6 Jun 2010 19:26:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jun 2010 19:26:16 +0000 X-ASF-Spam-Status: No, hits=-1523.3 required=10.0 tests=ALL_TRUSTED,AWL 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; Sun, 06 Jun 2010 19:26:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5658923888E8; Sun, 6 Jun 2010 19:25:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951932 - in /httpd/httpd/trunk: CHANGES support/ab.c Date: Sun, 06 Jun 2010 19:25:55 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100606192555.5658923888E8@eris.apache.org> Author: sf Date: Sun Jun 6 19:25:54 2010 New Revision: 951932 URL: http://svn.apache.org/viewvc?rev=951932&view=rev Log: ab: Fix memory leak with -v2 and SSL. PR: 49383 Submitted by: Pavel Kankovsky Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/support/ab.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=951932&r1=951931&r2=951932&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Sun Jun 6 19:25:54 2010 @@ -28,6 +28,9 @@ Changes with Apache 2.3.6 processing is completed, avoiding orphaned callback pointers. [Brett Gervasoni , Jeff Trawick] + *) ab: Fix memory leak with -v2 and SSL. PR 49383. + [Pavel Kankovsky ] + *) core: Add per-module and per-directory loglevel configuration. Add some more trace logging. mod_rewrite: Replace RewriteLog/RewriteLogLevel with trace log levels. Modified: httpd/httpd/trunk/support/ab.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?rev=951932&r1=951931&r2=951932&view=diff ============================================================================== --- httpd/httpd/trunk/support/ab.c (original) +++ httpd/httpd/trunk/support/ab.c Sun Jun 6 19:25:54 2010 @@ -557,6 +557,7 @@ static int ssl_print_connection_info(BIO static void ssl_print_cert_info(BIO *bio, X509 *cert) { X509_NAME *dn; + EVP_PKEY *pk; char buf[1024]; BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); @@ -568,8 +569,10 @@ static void ssl_print_cert_info(BIO *bio ASN1_UTCTIME_print(bio, X509_get_notAfter(cert)); BIO_printf(bio,"\n"); + pk = X509_get_pubkey(cert); BIO_printf(bio,"Public key is %d bits\n", - EVP_PKEY_bits(X509_get_pubkey(cert))); + EVP_PKEY_bits(pk)); + EVP_PKEY_free(pk); dn = X509_get_issuer_name(cert); X509_NAME_oneline(dn, buf, sizeof(buf));