mirror of
https://github.com/gnh1201/welsonjs.git
synced 2025-05-07 12:16:04 +00:00
commit
7a23340623
14
lib/http.js
14
lib/http.js
|
@ -86,6 +86,7 @@ var HTTPObject = function(engine) {
|
|||
this.isLoggingCookie = false;
|
||||
this.debuggingText = '';
|
||||
|
||||
this.curlVersion = "8.12.1_4";
|
||||
this.curlOptions = [];
|
||||
|
||||
this.charset = FILE.CdoCharset.CdoUTF_8;
|
||||
|
@ -118,11 +119,11 @@ var HTTPObject = function(engine) {
|
|||
// the location of cURL binary
|
||||
var arch = SYS.getArch();
|
||||
if (arch.toLowerCase().indexOf("arm") > -1) {
|
||||
this.setBinPath("bin\\x64\\curl-8.10.1_1-win64a-mingw\\bin\\curl.exe");
|
||||
this.setBinPath("bin\\x64\\curl-" + this.curlVersion + "-win64a-mingw\\bin\\curl.exe");
|
||||
} else if (arch.indexOf("64") > -1) {
|
||||
this.setBinPath("bin\\x64\\curl-8.10.1_1-win64-mingw\\bin\\curl.exe");
|
||||
this.setBinPath("bin\\x64\\curl-" + this.curlVersion + "-win64-mingw\\bin\\curl.exe");
|
||||
} else {
|
||||
this.setBinPath("bin\\x86\\curl-8.10.1_1-win32-mingw\\bin\\curl.exe");
|
||||
this.setBinPath("bin\\x86\\curl-" + this.curlVersion + "-win32-mingw\\bin\\curl.exe");
|
||||
}
|
||||
|
||||
// do not clear after calling the `exec`
|
||||
|
@ -142,6 +143,11 @@ var HTTPObject = function(engine) {
|
|||
console.info(this.engine, "is use", binPath);
|
||||
this._interface.setPrefix(binPath);
|
||||
};
|
||||
|
||||
this.setCurlVersion = function(curlVersion) {
|
||||
this.curlVersion = curlVersion;
|
||||
this.setEngine("CURL");
|
||||
};
|
||||
|
||||
this.jqEnabled = function() {
|
||||
return (typeof(window) !== "undefined" && typeof(window.jQuery) !== "undefined");
|
||||
|
@ -1215,7 +1221,7 @@ exports.parseURL = parseURL;
|
|||
exports.DEFAULT_USER_AGENT = DEFAULT_USER_AGENT;
|
||||
exports.defaultUserAgent = DEFAULT_USER_AGENT; // compatible
|
||||
|
||||
exports.VERSIONINFO = "HTTP REST API client for WelsonJS framework (http.js) version 0.7.45";
|
||||
exports.VERSIONINFO = "WelsonJS framework HTTP client (http.js) version 0.7.47";
|
||||
exports.AUTHOR = "abuse@catswords.net";
|
||||
exports.global = global;
|
||||
exports.require = global.require;
|
||||
|
|
Loading…
Reference in New Issue
Block a user