diff options
| author | iilyak <iilyak@ca.ibm.com> | 2017-06-06 07:55:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 07:55:11 -0700 |
| commit | 35cefa4fa1fe90342d262728648b732c388d7171 (patch) | |
| tree | 32f67abe9020cc36b138e299b1d56ffe2ae001b9 | |
| parent | 50fc4ce77373b310f8c35ef7f0d4ed80370c96da (diff) | |
| parent | 8dba9998d8bb28a8900541aa09108b5c3b1a17f6 (diff) | |
| download | couchdb-35cefa4fa1fe90342d262728648b732c388d7171.tar.gz | |
Merge pull request #580 from cloudant/83986-fix-url-encoding
Fix encoding issues
| -rw-r--r-- | src/chttpd/src/chttpd_db.erl | 2 | ||||
| -rw-r--r-- | src/chttpd/src/chttpd_show.erl | 2 | ||||
| -rw-r--r-- | src/couch_mrview/src/couch_mrview_show.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index 902b5b95b..a7796fcdf 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -1269,7 +1269,7 @@ db_attachment_req(#httpd{method=Method, user_ctx=Ctx}=Req, Db, DocId, FileNamePa {200, []}; _ -> {HttpCode, [{"Location", absolute_uri(Req, [$/, DbName, $/, couch_util:url_encode(DocId), $/, - FileName])}]} + couch_util:url_encode(FileName)])}]} end, send_json(Req,Status, Headers, {[ {ok, true}, diff --git a/src/chttpd/src/chttpd_show.erl b/src/chttpd/src/chttpd_show.erl index 49fed7b8d..63381ca4b 100644 --- a/src/chttpd/src/chttpd_show.erl +++ b/src/chttpd/src/chttpd_show.erl @@ -141,7 +141,7 @@ send_doc_update_response(Req, Db, DDoc, UpdateName, Doc, DocId) -> end, {JsonResp1} = apply_headers(JsonResp0, [ {<<"X-Couch-Update-NewRev">>, NewRevStr}, - {<<"X-Couch-Id">>, NewDoc#doc.id} + {<<"X-Couch-Id">>, couch_util:url_encode(NewDoc#doc.id)} ]), {[{<<"code">>, Code} | JsonResp1]}; [<<"up">>, _Other, {JsonResp0}] -> diff --git a/src/couch_mrview/src/couch_mrview_show.erl b/src/couch_mrview/src/couch_mrview_show.erl index 1ebc85b3e..3a602ad21 100644 --- a/src/couch_mrview/src/couch_mrview_show.erl +++ b/src/couch_mrview/src/couch_mrview_show.erl @@ -138,7 +138,7 @@ send_doc_update_response(Req, Db, DDoc, UpdateName, Doc, DocId) -> NewRevStr = couch_doc:rev_to_str(NewRev), {JsonResp1} = apply_headers(JsonResp0, [ {<<"X-Couch-Update-NewRev">>, NewRevStr}, - {<<"X-Couch-Id">>, NewDoc#doc.id} + {<<"X-Couch-Id">>, couch_util:url_encode(NewDoc#doc.id)} ]), {[{<<"code">>, 201} | JsonResp1]}; [<<"up">>, _Other, {JsonResp0}] -> |