gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-10-31 04:51:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #196 from gnh1201/dev

Browse Source 
Update http.js
This commit is contained in:
Namhyeon Go 2025-03-21 10:47:13 +09:00 committed by GitHub
commit 7a23340623
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/http.js
View File

@ -86,6 +86,7 @@ var HTTPObject = function(engine) {
this.isLoggingCookie = false; this.isLoggingCookie = false;
this.debuggingText = ''; this.debuggingText = '';
this.curlVersion = "8.12.1_4";
this.curlOptions = []; this.curlOptions = [];
this.charset = FILE.CdoCharset.CdoUTF_8; this.charset = FILE.CdoCharset.CdoUTF_8;
@ -118,11 +119,11 @@ var HTTPObject = function(engine) {
// the location of cURL binary // the location of cURL binary
var arch = SYS.getArch(); var arch = SYS.getArch();
if (arch.toLowerCase().indexOf("arm") > -1) { 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) { } 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 { } 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` // do not clear after calling the `exec`
@ -143,6 +144,11 @@ var HTTPObject = function(engine) {
this._interface.setPrefix(binPath); this._interface.setPrefix(binPath);
}; };
this.setCurlVersion = function(curlVersion) {
this.curlVersion = curlVersion;
this.setEngine("CURL");
};
this.jqEnabled = function() { this.jqEnabled = function() {
return (typeof(window) !== "undefined" && typeof(window.jQuery) !== "undefined"); return (typeof(window) !== "undefined" && typeof(window.jQuery) !== "undefined");
}; };
@ -1215,7 +1221,7 @@ exports.parseURL = parseURL;
exports.DEFAULT_USER_AGENT = DEFAULT_USER_AGENT; exports.DEFAULT_USER_AGENT = DEFAULT_USER_AGENT;
exports.defaultUserAgent = DEFAULT_USER_AGENT; // compatible 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.AUTHOR = "abuse@catswords.net";
exports.global = global; exports.global = global;
exports.require = global.require; exports.require = global.require;