From ecd6658ec62f0e8d875349c4b81c3f8fafc311f8 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 16 Feb 2020 20:44:45 +0000
Subject: [PATCH 1/2] Improve detection of "unknown" travis builds

---
 src/main.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 007d936..d328b33 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -81,7 +81,7 @@ lazy_static! {
     static ref HANDLES: MaxHandles = MaxHandles::new(20);
 }
 
-fn get_url(url: String) -> BoxFuture<'static, (String, Result<String, CheckerError>)> {
+fn get_url(url: String) -> BoxFuture<'static, (String, Result<(), CheckerError>)> {
     async move {
         let _handle = HANDLES.get().await;
         let mut res = Err(CheckerError::NotTried);
@@ -98,7 +98,7 @@ fn get_url(url: String) -> BoxFuture<'static, (String, Result<String, CheckerErr
                     res = Err(CheckerError::ReqwestError{error: err});
                     continue;
                 }
-                Ok(ref ok) => {
+                Ok(ok) => {
                     let status = ok.status();
                     if status != StatusCode::OK {
                         lazy_static! {
@@ -143,15 +143,16 @@ fn get_url(url: String) -> BoxFuture<'static, (String, Result<String, CheckerErr
                         static ref TRAVIS_IMG_REGEX: Regex = Regex::new(r"https://api.travis-ci.(?:com|org)/[^/]+/.+\.svg").unwrap();
                     }
                     if TRAVIS_IMG_REGEX.is_match(&url) {
-                        let content_dispostion = ok.headers().get(header::CONTENT_DISPOSITION).and_then(|h| h.to_str().ok()).unwrap_or("");
-                        debug!("Content dispostion for {} is '{}'", content_dispostion, url);
-                        if content_dispostion == "inline; filename=\"unknown.svg\"" {
+                        // Previously we checked the Content-Disposition headers, but sometimes that is incorrect
+                        // We're now looking for the explicit text "unknown" in the middle of the SVG
+                        let content = ok.text().await.unwrap();
+                        if content.contains("unknown") {
                             res = Err(CheckerError::TravisBuildUnknown);
                             break;
                         }
                     }
                     debug!("Finished {}", url);
-                    res = Ok(format!("{:?}", ok));
+                    res = Ok(());
                     break;
                 }
             }

From 42a6c6285f1f52032bdeb795d60661ecda0c5030 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 16 Feb 2020 20:45:04 +0000
Subject: [PATCH 2/2] Fix zola build badge, which was an "unknown" Travis build

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48a0c22..9977329 100644
--- a/README.md
+++ b/README.md
@@ -1425,7 +1425,7 @@ See also [Are we web yet?](http://www.arewewebyet.org) and [Rust web framework c
 * Reverse Proxy
   * [sozu-proxy/sozu](https://github.com/sozu-proxy/sozu) [[sozu](https://crates.io/crates/sozu)] — A HTTP reverse proxy. [![Build Status](https://api.travis-ci.org/sozu-proxy/sozu.svg?branch=master)](https://travis-ci.org/sozu-proxy/sozu)
 * Static Site Generators
-  * [getzola/zola](https://github.com/getzola/zola) [[zola](https://www.getzola.org/)] — An opinionated static site generator with everything built-in. [![Build Status](https://api.travis-ci.com/getzola/zola.svg?branch=master)](https://travis-ci.org/getzola/zola)
+  * [getzola/zola](https://github.com/getzola/zola) [[zola](https://www.getzola.org/)] — An opinionated static site generator with everything built-in. [![Build Status](https://dev.azure.com/getzola/zola/_apis/build/status/getzola.zola?branchName=master)](https://dev.azure.com/getzola/zola/_build/latest?definitionId=1&branchName=master)
   * [cobalt-org/cobalt.rs](https://github.com/cobalt-org/cobalt.rs) — Static site generator written in Rust [<img src="https://api.travis-ci.org/cobalt-org/cobalt.rs.svg?branch=master">](https://travis-ci.org/cobalt-org/cobalt.rs)
   * [FuGangqiang/mdblog.rs](https://github.com/FuGangqiang/mdblog.rs) — Static site generator from markdown files.
   * [leven-the-blog/leven](https://github.com/leven-the-blog/leven) [[leven](https://crates.io/crates/leven)] — A simple, parallelized blog generator. [<img src="https://api.travis-ci.org/quadrupleslap/leven.svg?branch=master">](https://travis-ci.org/quadrupleslap/leven)