Fixed merge leftovers in a coredns patch. (#7823)

microsoft · Feb 11, 2024 · 20f96bc · 20f96bc
1 parent bd9a5c7
commit 20f96bc
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/SPECS/coredns/CVE-2023-44487.patch b/SPECS/coredns/CVE-2023-44487.patch
@@ -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
@@ -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}
  }