Auto merge of rust-lang#3949 - alexcrichton:beta-next, r=alexcrichton

[beta] Update libgit2/libcurl on 1.17.0 Includes fixes for a few CVEs "recently" reported against libgit2/libcurl.
sailfish009 · Apr 24, 2017 · fe7b0cd · fe7b0cd
2 parents 2e31571 + f8eb184
commit fe7b0cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/build-auth.rs b/tests/build-auth.rs
@@ -34,9 +34,9 @@ fn http_auth_offered() {
         let mut conn = BufStream::new(server.accept().unwrap().0);
         let req = headers(&mut conn);
         let user_agent = if cfg!(windows) {
-            "User-Agent: git/1.0 (libgit2 0.25.0)"
+            "User-Agent: git/1.0 (libgit2 0.25.1)"
         } else {
-            "User-Agent: git/2.0 (libgit2 0.25.0)"
+            "User-Agent: git/2.0 (libgit2 0.25.1)"
         };
         conn.write_all(b"\
             HTTP/1.1 401 Unauthorized\r\n\
@@ -203,7 +203,7 @@ fn ssh_something_happens() {
 ", addr = addr))
                     .with_stderr_contains("\
 Caused by:
-  [[..]] failed to start SSH session: Failed getting banner
+  [[..]] Failed to start SSH session: Failed getting banner
 "));
     t.join().ok().unwrap();
 }