Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jensgrunert/npm
Browse files Browse the repository at this point in the history
* 'master' of github.com:jensgrunert/npm:
  Updating doc
  Adding configurable User-Agent to request header

Conflicts:
	doc/cli/config.md
	lib/utils/config-defs.js
  • Loading branch information
jensbin committed Apr 4, 2012
2 parents 737152b + 92487e5 commit 0d56414
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/utils/fetch.js
Expand Up @@ -58,6 +58,7 @@ function makeRequest (remote, fstr, headers) {
request({ url: remote
, proxy: proxy
, strictSSL: npm.config.get("strict-ssl")
, userAgent: npm.config.get("user-agent")
, ca: remote.host === regHost ? npm.config.get("ca") : undefined
, onResponse: onResponse }).pipe(fstr)
function onResponse (er, res) {
Expand Down

0 comments on commit 0d56414

Please sign in to comment.