cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764583 - /cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Date Mon, 13 Apr 2009 19:49:36 GMT
Author: dkulp
Date: Mon Apr 13 19:49:36 2009
New Revision: 764583

URL: http://svn.apache.org/viewvc?rev=764583&view=rev
Log:
Merged revisions 763616,763663 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r763616 | sergeyb | 2009-04-09 08:10:08 -0400 (Thu, 09 Apr 2009) | 1 line
  
  JAXRS: adding a missing test file, support for HEAD/OPTIONS, improving per-request handling

........
  r763663 | sergeyb | 2009-04-09 10:26:13 -0400 (Thu, 09 Apr 2009) | 1 line
  
  Fixing the build
........

Modified:
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=764583&r1=764582&r2=764583&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Mon Apr 13 19:49:36 2009
@@ -1867,10 +1867,10 @@
             
             // If this is a GET method we must not touch the output
             // stream as this automatically turns the request into a POST.
-            // Nor it should be done in case of DELETE - strangely, empty PUTs
-            // work ok 
-            if ("GET".equals(connection.getRequestMethod())
-                || "DELETE".equals(connection.getRequestMethod())) {
+            // Nor it should be done in case of DELETE/HEAD/OPTIONS 
+            // - strangely, empty PUTs work ok 
+            if (!"POST".equals(connection.getRequestMethod())
+                && !"PUT".equals(connection.getRequestMethod())) {
                 return;
             }
             



Mime
View raw message