Skip to content

Commit

Permalink
Allowing cacert bundle to be found in R_HOME/etc (r-lib#394)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiwalker-usgs authored and hadley committed Jul 25, 2017
1 parent 0681db7 commit 6620468
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# httr 1.2.1.9000

* Fix bug with cert bundle lookup: `find_cert_bundle()` will now return cert bundle
in "R_HOME/etc" (@jiwalker-usgs #386).

* `oauth_service_token()` gains a `sub` parameter so you can request
access on behalf of another user (#410).

Expand Down
2 changes: 1 addition & 1 deletion R/utils.r
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ find_cert_bundle <- function() {

bundled <- file.path(R.home("etc"), "curl-ca-bundle.crt")
if (file.exists(bundled))
bundled
return(bundled)

# Fall back to certificate bundle in openssl
system.file("cacert.pem", package = "openssl")
Expand Down

0 comments on commit 6620468

Please sign in to comment.