Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of bonkydog@gmail.com designates
 209.85.212.52 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:sender:in-reply-to:references:from:date
         :x-google-sender-auth:message-id:subject:to:content-type;
        b=vL3cXjOv2TaxuhGdTdCyR7IbZiXtp60I+sY1Psf0208FlfU7OAWzbazSnjsmCTdld5
         zLcCVGhB1/fgnGeM4kHdwBOHdFhKe4S5Mfi1YWoBAs3+ASog1ZCdxqnBwshjX2aZcCYS
         kef4kz0lP/Vo+xQRbUjkREnOj8/qQd099e10U=
MIME-Version: 1.0
Sender: bonkydog@gmail.com
In-Reply-To: <AANLkTinleK_tsAuxtU6mXdD4oLB4EBq_N51Ied7wIKak@mail.gmail.com>
References: <AANLkTinleK_tsAuxtU6mXdD4oLB4EBq_N51Ied7wIKak@mail.gmail.com>
From: Brian Jenkins <brian@brianjenkins.org>
Date: Thu, 10 Jun 2010 08:02:10 -0700
Message-ID: <AANLkTimvzc8A7Eh6hlFppEi94jg1Z3NTZv_bXNQlr10l@mail.gmail.com>
Subject: Re: X-HTTP-METHOD-OVERRIDE support
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=ISO-8859-1

On Wed, Jun 9, 2010 at 11:19 PM, Brian Jenkins <brian@brianjenkins.org> wrote:
>
> I've learned *just* enough Erlang to hack in support for X-HTTP-METHOD-OVERRIDE headers.
>
> It's in the trunk and 0.11.x branches here:
>
> http://github.com/bonkydog/couchdb
>

PS: Here's a patch


---
 share/Makefile.am                        |    1 +
 share/www/script/couch_tests.js          |    1 +
 share/www/script/test/method_override.js |   36 ++++++++++++++++++++++++++++++
 src/couchdb/couch_httpd.erl              |   12 ++++++++-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 share/www/script/test/method_override.js

diff --git a/share/Makefile.am b/share/Makefile.am
index 1622130..cb9aae2 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -136,6 +136,7 @@ nobase_dist_localdata_DATA = \
     www/script/test/lorem.txt \
     www/script/test/lorem_b64.txt \
     www/script/test/lots_of_docs.js \
+    www/script/test/method_override.js \
     www/script/test/multiple_rows.js \
     www/script/test/oauth.js \
     www/script/test/proxyauth.js \
diff --git a/share/www/script/couch_tests.js b/share/www/script/couch_tests.js
index 4225ce7..4f0d282 100644
--- a/share/www/script/couch_tests.js
+++ b/share/www/script/couch_tests.js
@@ -58,6 +58,7 @@ loadTest("jsonp.js");
 loadTest("large_docs.js");
 loadTest("list_views.js");
 loadTest("lots_of_docs.js");
+loadTest("method_override.js");
 loadTest("multiple_rows.js");
 loadScript("script/oauth.js");
 loadScript("script/sha1.js");
diff --git a/share/www/script/test/method_override.js
b/share/www/script/test/method_override.js
new file mode 100644
index 0000000..bc4d52f
--- /dev/null
+++ b/share/www/script/test/method_override.js
@@ -0,0 +1,36 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may
obtain a copy of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and
limitations under
+// the License.
+
+// Allow broken HTTP clients to fake a full method vocabulary with an
X-HTTP-METHOD-OVERRIDE header
+couchTests.method_override = function(debug) {
+  var result = JSON.parse(CouchDB.request("GET", "/").responseText);
+  T(result.couchdb == "Welcome");
+
+  var db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"false"});
+  db.deleteDb();
+
+  db.createDb();
+
+  var doc = {bob : "connie"};
+  xhr = CouchDB.request("POST", "/test_suite_db/fnord", {body:
JSON.stringify(doc), headers:{"Method-Override" : "PUT"}});
+  T(xhr.status == 201);
+
+  doc = db.open("fnord");
+  T(doc.bob == "connie");
+
+  xhr = CouchDB.request("POST", "/test_suite_db/fnord?rev=" +
doc._rev, {headers:{"Method-Override" : "DELETE"}});
+  T(xhr.status == 200)
+
+  doc = db.open("fnord");
+  T(doc == null);
+
+};
\ No newline at end of file
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index a8f0bb5..558149f 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -218,9 +218,17 @@ handle_request_int(MochiReq, DefaultFun,
         Meth -> couch_util:to_existing_atom(Meth)
     end,
     increment_method_stats(Method1),
+
+    % allow broken HTTP clients to fake a full method vocabulary with
an X-HTTP-METHOD-OVERRIDE header
+    MethodOverride = MochiReq:get_primary_header_value("Method-Override"),
+    Method2 = case lists:member(MethodOverride, ["GET", "HEAD",
"POST", "PUT", "DELETE", "TRACE", "CONNECT"]) of
+        true -> ?LOG_INFO("MethodOverride: ~s (real method was ~s)",
[MethodOverride, Method1]), list_to_atom(MethodOverride);
+        _ -> Method1
+    end,
+
     % alias HEAD to GET as mochiweb takes care of stripping the body
-    Method = case Method1 of
-        'HEAD' -> 'GET';
+    Method = case Method2 of
+            'HEAD' -> 'GET';
         Other -> Other
     end,

-- 
1.7.1