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 {
/a>Necoro1-184/+186 2008-01-20 r691@Devoty: necoro | 2008-01-20 15:19:45 +0100Necoro1-7/+9 2008-01-20 r690@Devoty: necoro | 2008-01-20 15:15:16 +0100Necoro4-527/+525 2008-01-20 r687@Devoty: necoro | 2008-01-20 13:56:53 +0100Necoro1-2/+2 2008-01-20 r686@Devoty: necoro | 2008-01-20 04:50:27 +0100Necoro1-2/+3 2008-01-20 r682@Devoty: necoro | 2008-01-20 03:23:02 +0100Necoro2-5/+5 2008-01-20 r680@Devoty: necoro | 2008-01-20 02:53:30 +0100Necoro7-55/+100 2008-01-19 r675@Devoty: necoro | 2008-01-19 23:33:38 +0100Necoro2-366/+396 2008-01-18 r669@Devoty: necoro | 2008-01-18 22:49:33 +0100Necoro1-6/+6 2008-01-18 r664@Devoty: necoro | 2008-01-18 21:40:29 +0100Necoro5-26/+181 2008-01-18 r661@Devoty: necoro | 2008-01-18 14:16:59 +0100Necoro8-211/+293 2008-01-18 r655@Devoty: necoro | 2008-01-18 03:04:53 +0100Necoro1-1/+1 2008-01-18 r651@Devoty: necoro | 2008-01-18 02:41:51 +0100Necoro3-393/+513 2008-01-18 r643@Devoty: necoro | 2008-01-16 18:55:49 +0100Necoro14-249/+525 2008-01-14 r634@Devoty: necoro | 2008-01-14 23:48:24 +0100Necoro3-1/+4 2008-01-14 r632@Devoty: necoro | 2008-01-14 23:44:52 +0100Necoro3-175/+181 2008-01-14(no commit message)Necoro10-758/+1014 2008-01-14 r621@Devoty: necoro | 2008-01-14 20:21:40 +0100Necoro2-21/+61 2008-01-14 r618@Devoty: necoro | 2008-01-14 20:19:05 +0100Necoro2-35/+57 2008-01-14 r617@Devoty: necoro | 2008-01-14 19:12:59 +0100Necoro2-10/+10 2008-01-14 r609@Devoty: necoro | 2008-01-14 17:04:38 +0100Necoro9-394/+477 2008-01-14 r605@Devoty: necoro | 2008-01-14 11:43:34 +0100Necoro2-26/+129 2008-01-14 r603@Devoty: necoro | 2008-01-14 11:30:26 +0100Necoro4-26/+38 2008-01-11 r598@Devoty: necoro | 2008-01-10 16:36:29 +0100Necoro4-10/+50 2008-01-11 r597@Devoty: necoro | 2008-01-10 14:12:35 +0100Necoro1-3/+3 2008-01-10 r595@Devoty: necoro | 2008-01-10 04:04:15 +0100Necoro1-52/+3 2008-01-09 r586@Devoty: necoro | 2008-01-09 14:54:18 +0100Necoro1-1/+1 2007-12-06 r577@Devoty: necoro | 2007-12-06 20:37:36 +0100Necoro1-1/+1 2007-12-06 r572@Devoty: necoro | 2007-11-28 08:48:15 +0100Necoro1-0/+1 2007-11-27 r570@Devoty: necoro | 2007-11-27 02:08:21 +0100Necoro3-84/+108