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 22A3F18DE8 for ; Sun, 20 Mar 2016 13:10:08 +0000 (UTC) Received: (qmail 38865 invoked by uid 500); 20 Mar 2016 13:10:08 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 38798 invoked by uid 500); 20 Mar 2016 13:10:08 -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 38788 invoked by uid 99); 20 Mar 2016 13:10:07 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Mar 2016 13:10:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9000BC073D for ; Sun, 20 Mar 2016 13:10:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id jPZWr7kbujwn for ; Sun, 20 Mar 2016 13:10:07 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id C71175F1D5 for ; Sun, 20 Mar 2016 13:10:06 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 0E1A4E013F for ; Sun, 20 Mar 2016 13:10:06 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D85FC3A02A7 for ; Sun, 20 Mar 2016 13:10:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1735875 - /httpd/httpd/trunk/modules/ssl/ssl_util.c Date: Sun, 20 Mar 2016 13:10:05 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160320131005.D85FC3A02A7@svn01-us-west.apache.org> Author: rjung Date: Sun Mar 20 13:10:05 2016 New Revision: 1735875 URL: http://svn.apache.org/viewvc?rev=1735875&view=rev Log: Support for OpenSSL 1.1.0: - remove thread locking. It is now builtin for OpenSSL 1.1.0 Modified: httpd/httpd/trunk/modules/ssl/ssl_util.c Modified: httpd/httpd/trunk/modules/ssl/ssl_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util.c?rev=1735875&r1=1735874&r2=1735875&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_util.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_util.c Sun Mar 20 13:10:05 2016 @@ -247,6 +247,7 @@ void ssl_asn1_table_unset(apr_hash_t *ta } #if APR_HAS_THREADS +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* * To ensure thread-safetyness in OpenSSL - work in progress */ @@ -454,4 +455,5 @@ void ssl_util_thread_setup(apr_pool_t *p apr_pool_cleanup_register(p, NULL, ssl_util_thread_cleanup, apr_pool_cleanup_null); } -#endif +#endif /* #if OPENSSL_VERSION_NUMBER < 0x10100000L */ +#endif /* #if APR_HAS_THREADS */