You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/09/03 22:06:33 UTC

couch commit: updated refs/heads/master to 1705267

Repository: couchdb-couch
Updated Branches:
  refs/heads/master e34699ed0 -> 170526781


Send application/javascript in JSONP responses

closes COUCHDB-2026


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/17052678
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/17052678
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/17052678

Branch: refs/heads/master
Commit: 17052678132d2192f61d31d830a4bcbbab91877b
Parents: e34699e
Author: Robert Newson <rn...@apache.org>
Authored: Wed Sep 3 21:05:04 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Sep 3 21:05:04 2014 +0100

----------------------------------------------------------------------
 src/couch_httpd.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/17052678/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 58b50f5..2fefd2f 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -935,7 +935,7 @@ negotiate_content_type(Req) ->
     case get(jsonp) of
         no_jsonp -> negotiate_content_type1(Req);
         [] -> negotiate_content_type1(Req);
-        _Callback -> "text/javascript"
+        _Callback -> "application/javascript"
     end.
 
 negotiate_content_type1(#httpd{mochi_req=MochiReq}) ->