diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2013-04-03 15:26:51 +0300 |
|---|---|---|
| committer | Simonas Kazlauskas <git@kazlauskas.me> | 2013-04-04 13:29:57 +0300 |
| commit | 63a3000f9cab6446ce40cf6d9671123baee6c22b (patch) | |
| tree | 9c33af1a8571074ba662a9d0e6c6f3ed8a24b585 /src/Hakyll | |
| parent | 5f6035b8e95c0fa5747d8b46b15f6e6c75651abd (diff) | |
| download | hakyll-63a3000f9cab6446ce40cf6d9671123baee6c22b.tar.gz | |
Account for scheme-relative URLs
http://url.spec.whatwg.org/#concept-scheme-relative-url
Diffstat (limited to 'src/Hakyll')
| -rw-r--r-- | src/Hakyll/Check.hs | 10 | ||||
| -rw-r--r-- | src/Hakyll/Web/Html.hs | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs index 48bb655..68ece18 100644 --- a/src/Hakyll/Check.hs +++ b/src/Hakyll/Check.hs @@ -198,12 +198,14 @@ checkExternalUrl url = do else do isOk <- liftIO $ handle (failure logger) $ Http.withManager $ \mgr -> do - request <- Http.parseUrl url + request <- Http.parseUrl $ urlToCheck url response <- Http.http (settings request) mgr let code = Http.statusCode (Http.responseStatus response) return $ code >= 200 && code < 300 - modify $ S.insert url + modify $ if schemeRelative url + then S.insert (urlToCheck url) . S.insert url + else S.insert url if isOk then ok url else faulty url where -- Add additional request info @@ -221,6 +223,10 @@ checkExternalUrl url = do failure logger (SomeException e) = case cast e of Just UserInterrupt -> throw UserInterrupt _ -> Logger.error logger (show e) >> return False + + -- Check scheme-relative links + schemeRelative = isPrefixOf "//" + urlToCheck uri = if schemeRelative uri then "http:" ++ uri else uri #else checkExternalUrl _ = return () #endif diff --git a/src/Hakyll/Web/Html.hs b/src/Hakyll/Web/Html.hs index 4053003..37e517d 100644 --- a/src/Hakyll/Web/Html.hs +++ b/src/Hakyll/Web/Html.hs @@ -120,7 +120,7 @@ toSiteRoot = emptyException . joinPath . map parent -------------------------------------------------------------------------------- -- | Check if an URL links to an external HTTP(S) source isExternal :: String -> Bool -isExternal url = any (flip isPrefixOf url) ["http://", "https://"] +isExternal url = any (flip isPrefixOf url) ["http://", "https://", "//"] -------------------------------------------------------------------------------- |