Make the Netty 4.1 upgrade one of the first patches

@aikar suggested this so patches don't have conflicts with netty 4.1
This commit is contained in:
Techcable 2016-05-31 11:48:53 -06:00
parent c6ee5b53a7
commit 05fc872738
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68
24 changed files with 34 additions and 34 deletions

View File

@ -1,4 +1,4 @@
From 4710be5dc64500475e0f5ea7606619978081be0c Mon Sep 17 00:00:00 2001
From a08dfab2aa4d78a8ecffb5278087fd4f846ea9bd Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Upgrade to netty 4.1
@ -73,10 +73,10 @@ index bbaef39..e094932 100644
* Allow this packet to be sent as an "extended" packet.
*/
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 44f0b61..e327325 100644
index dd00192..e941803 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -232,7 +232,7 @@ public class ServerConnector extends PacketHandler
@@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -86,7 +86,7 @@ index 44f0b61..e327325 100644
} else
{
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 7ba0bcb..fa57f28 100644
index cb9dbaf..2fcc7db 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -235,7 +235,7 @@ public class DownstreamBridge extends PacketHandler
@ -99,7 +99,7 @@ index 7ba0bcb..fa57f28 100644
// changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage );
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index f0d0189..aec8251 100644
index 621a06c..0ec3f81 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -41,9 +41,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;

View File

@ -1,4 +1,4 @@
From ca5884cd49b8a748e4efd99b72704513c8ea008f Mon Sep 17 00:00:00 2001
From 8a70c2911d76569ad26348f69161a8d425b8999d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Sep 2015 23:50:52 -0400
Subject: [PATCH] Allow configuration of the log file path/filename

View File

@ -1,4 +1,4 @@
From f48dd938af3f64fdaf55b7faee68eee70d20899e Mon Sep 17 00:00:00 2001
From 9b2fa052c06b3a6b21d2c30ada5acb488ca3c452 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files

View File

@ -1,4 +1,4 @@
From 086218556d597da5c0c353e992df0e558abe20e6 Mon Sep 17 00:00:00 2001
From 2e226193aef5c311a2538f289bc9c998ea3aeb3e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions

View File

@ -1,4 +1,4 @@
From c95af7c87401614b8c9d7fc0440f83d90fccdc3e Mon Sep 17 00:00:00 2001
From 78e50168fe904dfc506b81c2c768ff8b2f8184ad Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Sun, 9 Aug 2015 13:43:57 +0100
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
No breaking changes occur due to this patch.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index dd00192..5ed9fe4 100644
index e941803..58c6956 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;

View File

@ -1,4 +1,4 @@
From 89a2c870ce5222a1f0b8c0630f834f0fdcf7a25a Mon Sep 17 00:00:00 2001
From 636977900f68dd634ed201865e83c1543f265f79 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API

View File

@ -1,4 +1,4 @@
From 75a68ebcaaa12cd678da120ca24b3198d1c183cb Mon Sep 17 00:00:00 2001
From d6ebca34bef06b75eaa3133df4e57c02a0a34904 Mon Sep 17 00:00:00 2001
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

View File

@ -1,4 +1,4 @@
From 08114b37246a6c626a09d2c90fc01d69437a0da9 Mon Sep 17 00:00:00 2001
From 2ba4d2a3da76d19e3503c97b7d4d7483f6b2ced4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload

View File

@ -1,4 +1,4 @@
From 37ccc36c7cd188e0ef35944c3f199c9c50f6b6f4 Mon Sep 17 00:00:00 2001
From 86c5823b0bfdfc21e38850b46bb486c4e10e940c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 28 Feb 2016 22:46:22 -0700
Subject: [PATCH] Use ASM for events, via the Event4J library

View File

@ -1,4 +1,4 @@
From 4c762f426feb38a6d46bec74316d7d3035a01282 Mon Sep 17 00:00:00 2001
From b41c9aa1aff501ade3c07345a7c224ecbadb29e7 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Wed, 24 Feb 2016 17:16:23 +0000
Subject: [PATCH] Enable TCP_NODELAY.
@ -6,7 +6,7 @@ Subject: [PATCH] Enable TCP_NODELAY.
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 621a06c..76cce0c 100644
index 0ec3f81..c3833f4 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -121,6 +121,7 @@ public class PipelineUtils

View File

@ -1,4 +1,4 @@
From be615eb7dd1349ff58bdd5209e5f8b5d29e8e8a2 Mon Sep 17 00:00:00 2001
From 8fa1a3a9009cc9c7e5a7ff1f7237d70c29b4c2d6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations

View File

@ -1,4 +1,4 @@
From 4dffe93274f4dc09c8ee25379bdceec8b2e9df99 Mon Sep 17 00:00:00 2001
From 7dad680e878e890d1e947b7ef37ffa8db38c8459 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -62,7 +62,7 @@ index 2cbe052..08621b6 100644
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 5ed9fe4..7d14ea7 100644
index 58c6956..b6e6365 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -29,7 +29,9 @@ import net.md_5.bungee.forge.ForgeUtils;

View File

@ -1,4 +1,4 @@
From 49e4855a885268c5624f345203d6e93b06a7f45c Mon Sep 17 00:00:00 2001
From 9064784d8b4fed2f4517b93893c25135ae0b62fc Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks

View File

@ -1,4 +1,4 @@
From d89711fa5924cebb2002c5f93ae140d6d524bb84 Mon Sep 17 00:00:00 2001
From b65ecabcf59d43b4d2557c2683d24ec18b2517a5 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling

View File

@ -1,4 +1,4 @@
From 846293ecda045e28cf3b61d9bad5dcd3b160e006 Mon Sep 17 00:00:00 2001
From bcf531a5a5eb3ae03d1cc02d72136cd33a3e06ec Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Tue, 26 Jan 2016 01:01:57 +0000
Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@ -21,7 +21,7 @@ index eda9571..e5275c7 100644
{
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 76cce0c..f0d0189 100644
index c3833f4..aec8251 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -53,7 +53,7 @@ public class PipelineUtils

View File

@ -1,4 +1,4 @@
From c0255a9a2577c5fbea5b490b8cbd34a80ac26436 Mon Sep 17 00:00:00 2001
From 19e1b3c08e0437f39228722b7d3ecd2da2199dca Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -61,7 +61,7 @@ index 23a5c94..114961d 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 7d14ea7..44f0b61 100644
index b6e6365..e327325 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -377,6 +377,6 @@ public class ServerConnector extends PacketHandler
@ -73,7 +73,7 @@ index 7d14ea7..44f0b61 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index cb9dbaf..7ba0bcb 100644
index 2fcc7db..fa57f28 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -503,6 +503,6 @@ public class DownstreamBridge extends PacketHandler

View File

@ -1,4 +1,4 @@
From fffd6239429e262ba8e9f85b35aa1271137eb9bc Mon Sep 17 00:00:00 2001
From 8231b50a6a9304a31324eb05e2a2ca1484485bd4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 5 Oct 2015 23:20:54 -0400
Subject: [PATCH] Set a more reasonable Recycler Capacity

View File

@ -1,4 +1,4 @@
From 647f79db76c3a12371eeab0beabe41760e8ad66e Mon Sep 17 00:00:00 2001
From 585b5449ed9e6be1f52a33e6eb19dd9ed7a5a41e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 14 Feb 2016 01:03:27 -0500
Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log

View File

@ -1,4 +1,4 @@
From 033d667a3ecda5d349c5727133794c824c74dc84 Mon Sep 17 00:00:00 2001
From b46cf908db2da253ee392ba53f04601850e2ac50 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets

View File

@ -1,4 +1,4 @@
From 8a8e96bb45c7af0b572fd10e5cc84dd2cee4d555 Mon Sep 17 00:00:00 2001
From c3aabd2ed7a723485822d408a648a7cb9a078183 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 23 Jun 2015 21:56:13 +0200
Subject: [PATCH] Ignore incoming chat messages before connecting to the

View File

@ -1,4 +1,4 @@
From 96a2e827533d4f8080bd915265e39923d389c256 Mon Sep 17 00:00:00 2001
From 6b2815428c47ffb0e21f8a9f2409da37ac648191 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 15:59:52 -0700
Subject: [PATCH] Improve connection closing, fixing the kick delay.

View File

@ -1,4 +1,4 @@
From 3bce4160dcec9fa20a364de0f514f5d2c8e8d85f Mon Sep 17 00:00:00 2001
From 4d40f54046e9113e3ba08caab380499922c02ba3 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.

View File

@ -1,4 +1,4 @@
From ed18ef1b60b4cd24a47916696d8c1f3252e4d318 Mon Sep 17 00:00:00 2001
From 7dc90ef86d89ca211b2698325319b343947ccd66 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity

View File

@ -1,4 +1,4 @@
From 1f1df09244b1fe1746f9d48b000d2c54d86f64dc Mon Sep 17 00:00:00 2001
From cb5d2edbea4ce576f91f2e7b23bac8330b268d33 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 20 Mar 2016 01:36:23 -0400
Subject: [PATCH] Better race condition check for disconnect()