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 60AA5200B99 for ; Wed, 5 Oct 2016 13:39:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5F237160ADE; Wed, 5 Oct 2016 11:39:28 +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 9B679160ADB for ; Wed, 5 Oct 2016 13:39:27 +0200 (CEST) Received: (qmail 47574 invoked by uid 500); 5 Oct 2016 11:39:26 -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 47564 invoked by uid 99); 5 Oct 2016 11:39:26 -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, 05 Oct 2016 11:39:26 +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 3012B18066B for ; Wed, 5 Oct 2016 11:39:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id fwmwovzDecBo for ; Wed, 5 Oct 2016 11:39:24 +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 E343E5FB82 for ; Wed, 5 Oct 2016 11:39:23 +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 EFA16E017A for ; Wed, 5 Oct 2016 11:39:22 +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 EB09C3A00EC for ; Wed, 5 Oct 2016 11:39:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763430 - in /tomcat/trunk/bin: catalina.bat catalina.sh Date: Wed, 05 Oct 2016 11:39:21 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161005113921.EB09C3A00EC@svn01-us-west.apache.org> archived-at: Wed, 05 Oct 2016 11:39:28 -0000 Author: markt Date: Wed Oct 5 11:39:21 2016 New Revision: 1763430 URL: http://svn.apache.org/viewvc?rev=1763430&view=rev Log: Better comments Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1763430&r1=1763429&r2=1763430&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Wed Oct 5 11:39:21 2016 @@ -202,7 +202,7 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%" rem Register custom URL handlers -rem Do this here so they can be used in the security policy +rem Do this here so custom URL handles (specifically 'war:...') can be used in the security policy set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" if not "%LOGGING_CONFIG%" == "" goto noJuliConfig Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1763430&r1=1763429&r2=1763430&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Wed Oct 5 11:39:21 2016 @@ -241,7 +241,7 @@ fi JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS" # Register custom URL handlers -# Do this here so they can be used in the security policy +# Do this here so custom URL handles (specifically 'war:...') can be used in the security policy JAVA_OPTS="%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" # Set juli LogManager config file if it is present and an override has not been issued --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org