Skip to content

Commit

Permalink
Merge branch 'net-http'
Browse files Browse the repository at this point in the history
  • Loading branch information
mislav committed Jul 21, 2015
2 parents c69813c + 2c97f3c commit 1b10688
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ processing the request/response cycle.

Faraday supports these adapters:

* Net::HTTP
* [Net::HTTP][net_http] _(default)_
* [Net::HTTP::Persistent][persistent]
* [Excon][]
* [Typhoeus][]
* [Patron][]
Expand Down Expand Up @@ -209,12 +210,14 @@ of a major release, support for that Ruby version may be dropped.
Copyright (c) 2009-2013 [Rick Olson](mailto:[email protected]), Zack Hobson.
See [LICENSE][] for details.

[travis]: http://travis-ci.org/lostisland/faraday
[excon]: https://github.com/geemus/excon#readme
[typhoeus]: https://github.com/typhoeus/typhoeus#readme
[patron]: http://toland.github.com/patron/
[net_http]: http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/Net/HTTP.html
[persistent]: https://github.com/drbrain/net-http-persistent
[travis]: http://travis-ci.org/lostisland/faraday
[excon]: https://github.com/geemus/excon#readme
[typhoeus]: https://github.com/typhoeus/typhoeus#readme
[patron]: http://toland.github.com/patron/
[eventmachine]: https://github.com/igrigorik/em-http-request#readme
[httpclient]: https://github.com/nahi/httpclient
[jruby]: http://jruby.org/
[rubinius]: http://rubini.us/
[license]: LICENSE.md
[httpclient]: https://github.com/nahi/httpclient
[jruby]: http://jruby.org/
[rubinius]: http://rubini.us/
[license]: LICENSE.md
1 change: 0 additions & 1 deletion lib/faraday/adapter/net_http_persistent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

module Faraday
class Adapter
# Experimental adapter for net-http-persistent
class NetHttpPersistent < NetHttp
dependency 'net/http/persistent'

Expand Down

0 comments on commit 1b10688

Please sign in to comment.