Merge pull request #1149 from hknustwmf/master

Removed mwUtil.decodeBody
wikimedia · Jun 5, 2019 · 00c09ca · 00c09ca
2 parents 1fa9433 + 95cc068
commit 00c09ca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/lib/mwUtil.js b/lib/mwUtil.js
@@ -5,7 +5,6 @@ const contentType = require('content-type');
 const jwt = require('jsonwebtoken');
 const P = require('bluebird');
 const entities = require('entities');
-const gunzip = P.promisify(require('zlib').gunzip);
 const Title = require('mediawiki-title').Title;
 const HyperSwitch = require('hyperswitch');
 const querystring = require('querystring');
@@ -272,24 +271,6 @@ mwUtil.decodePagingToken = (hyper, token) => {
     }
 };
 
-mwUtil.decodeBody = (contentResponse) => {
-    let prepare;
-    if (contentResponse.headers &&
-            contentResponse.headers['content-encoding'] === 'gzip') {
-        delete contentResponse.headers['content-encoding'];
-        prepare = gunzip(contentResponse.body);
-    } else {
-        prepare = P.resolve(contentResponse.body);
-    }
-    return prepare.then((body) => {
-        if (body && Buffer.isBuffer(body)) {
-            body = body.toString();
-        }
-        contentResponse.body = body;
-        return contentResponse;
-    });
-};
-
 /**
  *
  * @param   {!HyperSwitch}  hyper       HyperSwitch context

diff --git a/sys/parsoid.js b/sys/parsoid.js
@@ -390,9 +390,7 @@ class ParsoidService {
         .then((revInfo) => {
             rp.revision = revInfo.rev;
         })
-        .then(() => P.join(
-            this._getPageBundleFromParsoid(hyper, req),
-            mwUtil.decodeBody(currentContentRes))
+        .then(() => P.join(this._getPageBundleFromParsoid(hyper, req), currentContentRes)
         .spread((res, currentContentRes) => {
             const tid  = uuid.now().toString();
             const etag = mwUtil.makeETag(rp.revision, tid);