Author: jan
Date: Fri Sep 11 12:32:27 2009
New Revision: 813806
URL: http://svn.apache.org/viewvc?rev=813806&view=rev
Log:
merge r813803: fix oauth access to design documents, patch by Jason Davies
Modified:
couchdb/branches/0.10.x/ (props changed)
couchdb/branches/0.10.x/etc/default/couchdb (props changed)
couchdb/branches/0.10.x/src/couchdb/couch_httpd_oauth.erl
Propchange: couchdb/branches/0.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 12:32:27 2009
@@ -3,4 +3,4 @@
/couchdb/branches/form:729440-730015
/couchdb/branches/list-iterator:782292-784593
/couchdb/branches/tail_header:775760-778477
-/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910
+/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803
Propchange: couchdb/branches/0.10.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 12:32:27 2009
@@ -3,5 +3,5 @@
/couchdb/branches/form/etc/default/couchdb:729440-730015
/couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
/couchdb/branches/tail_header/etc/default/couchdb:775760-778477
-/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910
+/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.10.x/src/couchdb/couch_httpd_oauth.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_httpd_oauth.erl?rev=813806&r1=813805&r2=813806&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/couch_httpd_oauth.erl (original)
+++ couchdb/branches/0.10.x/src/couchdb/couch_httpd_oauth.erl Fri Sep 11
12:32:27 2009
@@ -144,7 +144,7 @@
couch_httpd:send_error(Req, 400,
<<"invalid_consumer">>, <<"Invalid consumer (key or signature method).">>);
Consumer ->
Signature = proplists:get_value("oauth_signature",
Params),
- URL = couch_httpd:absolute_uri(Req,
MochiReq:get(path)),
+ URL = couch_httpd:absolute_uri(Req,
MochiReq:get(raw_path)),
Fun(URL, proplists:delete("oauth_signature",
Params),
Consumer, Signature)
end
