Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make ciphers and secureProtocol to work in https request #666

Merged
merged 2 commits into from
Sep 22, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions request.js
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,8 @@ Request.prototype.getAgent = function () {
}
}
if (this.ca) options.ca = this.ca
if (this.ciphers) options.ciphers = this.ciphers
if (this.secureProtocol) options.secureProtocol = this.secureProtocol
if (typeof this.rejectUnauthorized !== 'undefined') options.rejectUnauthorized = this.rejectUnauthorized

if (this.cert && this.key) {
Expand Down Expand Up @@ -539,9 +541,9 @@ Request.prototype.getAgent = function () {
poolKey += options.ciphers
}

if (options.secureOptions) {
if (options.secureProtocol) {
if (poolKey) poolKey += ':'
poolKey += options.secureOptions
poolKey += options.secureProtocol
}
}

Expand Down