Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Update http crate to fix security vulnerability (bp #7725) #7729

Merged
merged 2 commits into from
Jan 9, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2020

This is an automated backport of pull request #7725 done by Mergify.io

Cherry-pick of 719785a has failed:

On branch mergify/bp/v0.22/pr-7725
Your branch is up to date with 'origin/v0.22'.

You are currently cherry-picking commit 719785a8d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   ci/test-checks.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:
  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR
  • @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

jstarry and others added 2 commits January 9, 2020 19:44
* Update http to fix security vulnerability

* Ignore RUSTSEC because they incorrectly says http 0.1.21 is vulnerable

(cherry picked from commit 719785a)

# Conflicts:
#	Cargo.lock
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 9, 2020
@solana-grimes solana-grimes merged commit 216cc34 into v0.22 Jan 9, 2020
@codecov
Copy link

codecov bot commented Jan 9, 2020

Codecov Report

Merging #7729 into v0.22 will increase coverage by 10.9%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           v0.22   #7729      +/-   ##
========================================
+ Coverage   69.9%   80.8%   +10.9%     
========================================
  Files        242     242              
  Lines      58798   50813    -7985     
========================================
- Hits       41123   41106      -17     
+ Misses     17675    9707    -7968

@mergify mergify bot deleted the mergify/bp/v0.22/pr-7725 branch January 9, 2020 20:51
sakridge pushed a commit to sakridge/solana that referenced this pull request Jan 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants