suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow header object instead of just content type in server responses

Browse Source
This commit is contained in:
Dan Stillman 2018-05-13 04:27:27 -04:00
parent 05843bb093
commit 81ab8f7b20
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome/content/zotero/xpcom/server.js
View File

@ -333,7 +333,7 @@ Zotero.Server.DataListener.prototype._bodyData = function() {
/** /**
* Generates the response to an HTTP request * Generates the response to an HTTP request
*/ */
Zotero.Server.DataListener.prototype._generateResponse = function(status, contentType, body) { Zotero.Server.DataListener.prototype._generateResponse = function (status, contentTypeOrHeaders, body) {
var response = "HTTP/1.0 "+status+" "+Zotero.Server.responseCodes[status]+"\r\n"; var response = "HTTP/1.0 "+status+" "+Zotero.Server.responseCodes[status]+"\r\n";
// Translation server // Translation server
@ -363,8 +363,15 @@ Zotero.Server.DataListener.prototype._generateResponse = function(status, conten
} }
} }
if(contentType) { if (contentTypeOrHeaders) {
response += "Content-Type: "+contentType+"\r\n"; if (typeof contentTypeOrHeaders == 'string') {
contentTypeOrHeaders = {
'Content-Type': contentTypeOrHeaders
};
}
for (let header in contentTypeOrHeaders) {
response += `${header}: ${contentTypeOrHeaders[header]}\r\n`;
}
} }
if(body) { if(body) {
@ -439,9 +446,9 @@ Zotero.Server.DataListener.prototype._processEndpoint = Zotero.Promise.coroutine
} }
// set up response callback // set up response callback
var sendResponseCallback = function (code, contentType, arg, options) { var sendResponseCallback = function (code, contentTypeOrHeaders, arg, options) {
this._requestFinished( this._requestFinished(
this._generateResponse(code, contentType, arg), this._generateResponse(code, contentTypeOrHeaders, arg),
options options
); );
}.bind(this); }.bind(this);