From dev-return-193309-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Thu Sep 13 15:44:20 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 52F9A180649 for ; Thu, 13 Sep 2018 15:44:20 +0200 (CEST) Received: (qmail 73305 invoked by uid 500); 13 Sep 2018 13:44:19 -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 73295 invoked by uid 99); 13 Sep 2018 13:44:19 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2018 13:44:19 +0000 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 788BC3A07E6 for ; Thu, 13 Sep 2018 13:44:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1840817 - /tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Date: Thu, 13 Sep 2018 13:44:17 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180913134418.788BC3A07E6@svn01-us-west.apache.org> Author: markt Date: Thu Sep 13 13:44:17 2018 New Revision: 1840817 URL: http://svn.apache.org/viewvc?rev=1840817&view=rev Log: Improve handling of OPTIONS request Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1840817&r1=1840816&r2=1840817&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Sep 13 13:44:17 2018 @@ -588,6 +588,29 @@ public final class CGIServlet extends Ht } + @Override + protected void doOptions(HttpServletRequest req, HttpServletResponse res) + throws ServletException, IOException { + // Note: This method will never be called if cgiMethods is "*" so that + // case does nto need to be handled here. + Set allowedMethods = new HashSet<>(); + allowedMethods.addAll(cgiMethods); + allowedMethods.addAll(CGIServlet.DEFAULT_SUPER_METHODS); + + StringBuilder headerValue = new StringBuilder(); + + for (String method : allowedMethods) { + headerValue.append(method); + headerValue.append(','); + } + + // Remove trailing comma + headerValue.deleteCharAt(headerValue.length() - 1); + + res.setHeader("allow", headerValue.toString()); + } + + /** * Behaviour depends on the status code. * --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org