Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 376CA200B27 for ; Wed, 22 Jun 2016 21:39:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 365A6160A36; Wed, 22 Jun 2016 19:39:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7A790160A24 for ; Wed, 22 Jun 2016 21:39:16 +0200 (CEST) Received: (qmail 30764 invoked by uid 500); 22 Jun 2016 19:39:15 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 30754 invoked by uid 99); 22 Jun 2016 19:39:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2016 19:39:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id E8AB61804C2 for ; Wed, 22 Jun 2016 19:39:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id PHTcYSLkaZm5 for ; Wed, 22 Jun 2016 19:39:14 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 8F63C5FAC4 for ; Wed, 22 Jun 2016 19:39:13 +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 8636FE0069 for ; Wed, 22 Jun 2016 19:39:12 +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 3496A3A031D for ; Wed, 22 Jun 2016 19:39:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1749766 - in /tomcat/native/trunk: native/src/sslnetwork.c xdocs/miscellaneous/changelog.xml Date: Wed, 22 Jun 2016 19:39:11 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160622193912.3496A3A031D@svn01-us-west.apache.org> archived-at: Wed, 22 Jun 2016 19:39:17 -0000 Author: markt Date: Wed Jun 22 19:39:11 2016 New Revision: 1749766 URL: http://svn.apache.org/viewvc?rev=1749766&view=rev Log: Correctly handle OS level EAGAIN return codes during non-blocking TLS I/O Modified: tomcat/native/trunk/native/src/sslnetwork.c tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/native/src/sslnetwork.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1749766&r1=1749765&r2=1749766&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslnetwork.c (original) +++ tomcat/native/trunk/native/src/sslnetwork.c Wed Jun 22 19:39:11 2016 @@ -339,8 +339,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand } break; case SSL_ERROR_SYSCALL: + if (APR_STATUS_IS_EAGAIN(rv)) { + return APR_EAGAIN; + } #if !defined(_WIN32) - if (APR_STATUS_IS_EINTR(rv)) { + else if (APR_STATUS_IS_EINTR(rv)) { /* Interrupted by signal */ continue; } @@ -427,6 +430,9 @@ ssl_socket_recv(apr_socket_t *sock, char con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD; return APR_EOF; } + else if (APR_STATUS_IS_EAGAIN(rv)) { + return APR_EAGAIN; + } #if !defined(_WIN32) else if (APR_STATUS_IS_EINTR(rv)) { /* Interrupted by signal Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1749766&r1=1749765&r2=1749766&view=diff ============================================================================== --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Jun 22 19:39:11 2016 @@ -40,6 +40,10 @@ 59616: Correct the Windows build files so that OCSP is correctly enabled and disabled in the respective Windows binaries. (markt) + + Correctly handle OS level EAGAIN return codes during non-blocking TLS I/O. + (markt) +
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org