Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188235
Change subject: Querystring cleanup
......................................................................
Querystring cleanup
* Use request's option.
Change-Id: Ic7e20dd910e8a48da7fc467469a62aed7e4311cd
---
M lib/mediawiki.ApiRequest.js
1 file changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/35/188235/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index faf2b74..3934058 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -11,7 +11,6 @@
require('http').globalAgent = httpAgent;
var request = require('request'),
- qs = require('querystring'),
events = require('events'),
util = require('util'),
domino = require('domino');
@@ -141,7 +140,7 @@
* @param {Object} response The API response object, with error code
* @param {string} body The body of the response from the API
*/
-ApiRequest.prototype._requestCB = function (error, response, body) {
+ApiRequest.prototype._requestCB = function( error, response, body ) {
var self = this;
if (error) {
@@ -165,7 +164,7 @@
this._handleBody( null, body );
} else {
if (response.statusCode === 412) {
- this.env.log("info", "Cache MISS:", this.uri);
+ this.env.log("info", "Cache MISS:",
response.request.href);
} else {
this.env.log("warning", "non-200 response:",
response.statusCode, body);
}
@@ -235,13 +234,14 @@
apiargs.titles = title;
}
- var uri = env.conf.wiki.apiURI + '?' + qs.stringify( apiargs ),
+ var uri = env.conf.wiki.apiURI,
proxy = env.conf.wiki.apiProxy;
this.requestOptions = {
method: 'GET',
followRedirect: true,
uri: uri,
+ qs: apiargs,
timeout: 40 * 1000, // 40 seconds
proxy: proxy && proxy.uri,
strictSSL: env.conf.parsoid.strictSSL,
@@ -612,7 +612,7 @@
* @param {string} title The title of the page to use as context
* @param {oldid} oldid The oldid to request
*/
-function ParsoidCacheRequest ( env, title, oldid, options ) {
+function ParsoidCacheRequest( env, title, oldid, options ) {
ApiRequest.call(this, env, title);
if (!options) {
@@ -628,16 +628,15 @@
};
var uri = env.conf.parsoid.parsoidCacheURI +
- env.conf.wiki.iwp + '/' +
encodeURIComponent(title.replace(/ /g, '_')) +
- '?' + qs.stringify( apiargs );
+ env.conf.wiki.iwp + '/' + encodeURIComponent(title.replace(/
/g, '_'));
- this.uri = uri;
this.retries = 0;
this.requestOptions = {
// Use GET so that our request is cacheable
method: 'GET',
followRedirect: false,
uri: uri,
+ qs: apiargs,
strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
@@ -726,7 +725,8 @@
this.requestOptions = {
method: 'GET',
followRedirect: true,
- uri: uri + '?' + qs.stringify( apiargs ),
+ uri: uri,
+ qs: apiargs,
timeout: 40 * 1000,
proxy: proxy && proxy.uri,
strictSSL: env.conf.parsoid.strictSSL,
@@ -787,7 +787,7 @@
var ix,
conf = env.conf.wiki,
- uri = conf.apiURI + '?',
+ uri = conf.apiURI,
filenames = [ filename ],
imgnsid = conf.canonicalNamespaces.image,
imgns = conf.namespaceNames[imgnsid],
@@ -820,14 +820,13 @@
}
}
- uri += qs.stringify( apiArgs );
-
var proxy = env.conf.wiki.apiProxy;
this.requestOptions = {
method: 'GET',
followRedirect: true,
uri: uri,
+ qs: apiArgs,
timeout: 40 * 1000,
proxy: proxy && proxy.uri,
headers: {
--
To view, visit https://gerrit.wikimedia.org/r/188235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7e20dd910e8a48da7fc467469a62aed7e4311cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
