Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-02 16:49:31 +01:00
Code Issues Projects Releases Wiki Activity
bcad1e9b55
Waterfall/BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch

23 lines
1.1 KiB
Diff
Raw Normal View History

No need to relocate the metrics class Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 21:34:59 +01:00
From 344cc3d7f77465bc3ec499fd950f5afc6024aba7 Mon Sep 17 00:00:00 2001
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
No need to relocate the metrics class Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 21:34:59 +01:00
index a3c8caf..64a0dc5 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
No need to relocate the metrics class Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 21:34:59 +01:00
@@ -314,6 +314,8 @@ public class BungeeCord extends ProxyServer
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
new ServerBootstrap()
.channel( PipelineUtils.getServerChannel() )
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
+ .childOption( ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 1024 * 1024 * 10 )
+ .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops )
--
No need to relocate the metrics class Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 21:34:59 +01:00
2.10.0
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
Reference in New Issue Copy Permalink