Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 76835 invoked from network); 21 Feb 2007 16:27:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Feb 2007 16:27:38 -0000 Received: (qmail 11533 invoked by uid 500); 21 Feb 2007 16:27:47 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 11517 invoked by uid 500); 21 Feb 2007 16:27:47 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 11508 invoked by uid 99); 21 Feb 2007 16:27:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2007 08:27:46 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2007 08:27:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 942FE1A981A; Wed, 21 Feb 2007 08:27:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r510085 - /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java Date: Wed, 21 Feb 2007 16:27:17 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070221162717.942FE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Wed Feb 21 08:27:16 2007 New Revision: 510085 URL: http://svn.apache.org/viewvc?view=rev&rev=510085 Log: Although the GData documentation uses the header "X-HTTP-Method-Override", some client implementations have used "X-Method-Override". For the sake of being lenient, let's check for X-Method-Override if X-HTTP-Method-Override has not been set. Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java?view=diff&rev=510085&r1=510084&r2=510085 ============================================================================== --- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java (original) +++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/MethodOverrideFilter.java Wed Feb 21 08:27:16 2007 @@ -54,7 +54,7 @@ response); HttpServletResponse hresponse = (HttpServletResponse) response; - hresponse.addHeader("Vary", "X-HTTP-Method-Override"); + hresponse.addHeader("Vary", "X-HTTP-Method-Override, X-Method-Override"); } public void init(FilterConfig config) throws ServletException { @@ -81,10 +81,12 @@ public String getMethod() { String method = super.getMethod(); String xheader = getHeader("X-HTTP-Method-Override"); + if (xheader == null) xheader = getHeader("X-Method-Override"); + if (xheader != null) xheader = xheader.toUpperCase().trim(); if (method.equals("POST") && xheader != null && METHODS_TO_OVERRIDE.contains(xheader)) { - method = xheader.trim(); + method = xheader; } return method; }