Skip to content

Fixed merge leftovers in a coredns patch. #7823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PawelWMS merged 3 commits into from
Feb 11, 2024
Merged

Fixed merge leftovers in a coredns patch. #7823

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b446b
Removing merge leftovers.
PawelWMS Feb 11, 2024
a5281ef
Removing more merge leftovers.
PawelWMS Feb 11, 2024
8005b34
Removing more merge leftovers.
PawelWMS Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions SPECS/coredns/CVE-2023-44487.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<<<<<<< HEAD
From fb899a313ff29828e2c64ee5ce05a0187451aec9 Mon Sep 17 00:00:00 2001
=======
From 7a9639b4702703fa7d11b154ae814471b1c0ed88 Mon Sep 17 00:00:00 2001
>>>>>>> 298f5d5ad (Patch CVE-2023-44487 in vendored golang (#7780))
From: Damien Neil <dneil@google.com>
Date: Fri, 6 Oct 2023 09:51:19 -0700
Subject: [PATCH] http2: limit maximum handler goroutines to
Expand Down Expand Up @@ -88,11 +83,7 @@ index 033b6e6..4561e3c 100644
+ sc.curHandlers++
go sc.runHandler(rw, req, sc.handler.ServeHTTP)
}
<<<<<<< HEAD

=======

>>>>>>> 298f5d5ad (Patch CVE-2023-44487 in vendored golang (#7780))
@@ -2286,8 +2294,62 @@ func (sc *serverConn) newResponseWriter(st *stream, req *http.Request) *response
return &responseWriter{rws: rws}
}
Expand Down