aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--internal/feed/parse.go19
1 files changed, 12 insertions, 7 deletions
diff --git a/internal/feed/parse.go b/internal/feed/parse.go
index cc55581..539cad0 100644
--- a/internal/feed/parse.go
+++ b/internal/feed/parse.go
@@ -13,10 +13,16 @@ import (
)
// share HTTP clients
-var stdHTTPClient = &http.Client{Transport: http.DefaultTransport}
-var unsafeHTTPClient *http.Client
+var (
+ stdHTTPClient *http.Client
+ unsafeHTTPClient *http.Client
+)
func init() {
+ // std
+ stdHTTPClient = &http.Client{Transport: http.DefaultTransport}
+
+ // unsafe
tlsConfig := &tls.Config{InsecureSkipVerify: true}
transport := http.DefaultTransport.(*http.Transport).Clone()
transport.TLSClientConfig = tlsConfig
@@ -27,12 +33,11 @@ func context(timeout int) (ctxt.Context, ctxt.CancelFunc) {
return ctxt.WithTimeout(ctxt.Background(), time.Duration(timeout)*time.Second)
}
-func setHTTPClient(parser *gofeed.Parser, disableTLS bool) {
+func httpClient(disableTLS bool) *http.Client {
if disableTLS {
- parser.Client = unsafeHTTPClient
- } else {
- parser.Client = stdHTTPClient
+ return unsafeHTTPClient
}
+ return stdHTTPClient
}
func parseFeed(feed *Feed) error {
@@ -40,7 +45,7 @@ func parseFeed(feed *Feed) error {
defer cancel()
fp := gofeed.NewParser()
- setHTTPClient(fp, *feed.NoTLS)
+ fp.Client = httpClient(*feed.NoTLS)
parsedFeed, err := fp.ParseURLWithContext(feed.Url, ctx)
if err != nil {
'/others/pass.git/commit/contrib/importers/keepassx2pass.py?id=4d53be77860a35db40bf616ef4c4b5d54dabb395&follow=1'>keepassx2pass: Substitute empty string for NoneAndrew Spiers1-1/+4 2014-06-16emacs: Use PASSWORD_STORE_CLIP_TIME env variableSvend Sorensen1-4/+7 2014-06-16emacs: Use when instead of if/prognSvend Sorensen1-5/+4 2014-06-16emacs: Update pass website URLSvend Sorensen1-1/+1 2014-05-27Update for new URL.Jason A. Donenfeld3-3/+3 2014-05-14Bump version1.6.2Jason A. Donenfeld1-1/+1 2014-05-14Don't define tmpdir on git init.Jason A. Donenfeld1-4/+3 2014-05-14Disable secmem warning when discovering keysmilki2-2/+2 2014-05-10edit: Quote editor so tests work in spaced directories.Jason A. Donenfeld1-1/+1 2014-05-10reencryption: Properly escape input to sedJason A. Donenfeld1-1/+1 2014-05-10git: use secure tmp directoryJason A. Donenfeld1-4/+11 2014-05-10configure git to decrypt gpg files automaticallySamuel Le Thiec1-0/+5 2014-05-08completion: add new generate flagsJason A. Donenfeld3-2/+7 2014-05-08inplace: mutually exclusive with forceJason A. Donenfeld2-3/+3 2014-05-08usage: tab to spacesJason A. Donenfeld1-1/+1 2014-05-08generate: use nice ansi colors instead.Jason A. Donenfeld1-3/+2 2014-05-08zsh: posix compatible sed fix for zsh-completionJason A. Donenfeld1-1/+1 2014-05-07Implement interactive init functionSvend Sorensen1-0/+8 2014-05-07Implement interactive rename functionSvend Sorensen1-0/+7 2014-05-07Reorder interactive function to match order of helper functionsSvend Sorensen1-13/+13 2014-05-07Make edit helper function name consistent with other helpersSvend Sorensen1-1/+1 2014-05-07Factor out password completing-read functionSvend Sorensen1-4/+8 2014-05-07Add dash to Package-RequiresSvend Sorensen1-1/+1 2014-05-06Force sane sort order.Jason A. Donenfeld1-2/+2 2014-05-06generate: add --in-place optionJason A. Donenfeld4-9/+33