MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update netty to 4.1.9

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-03-16 17:45:18 +01:00
parent 638fb39612
commit ac4a7ce28e
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Netty.xml
Generated
+2 -2
View File
@@ -4,11 +4,11 @@
<root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.6.Final.Patched.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.9.Final.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.6.Final.Patched-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.9.Final-sources.jar!/" />
</SOURCES>
</library>
</component>
jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class Launcher {
// IDEA-120811; speeding up DefaultChannelIDd calculation for netty
//if (Boolean.parseBoolean(System.getProperty("io.netty.random.id"))) {
System.setProperty("io.netty.machineId", "9e43d860");
System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e");
System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
System.setProperty("io.netty.serviceThreadPrefix", "Netty");
//}
lib/netty-all-4.1.6.Final.Patched.jar → lib/netty-all-4.1.9.Final.jar
BIN
View File
Binary file not shown.
lib/src/netty-all-4.1.6.Final.Patched-sources.jar → lib/src/netty-all-4.1.9.Final-sources.jar
BIN
View File
Binary file not shown.
platform/platform-impl/src/com/intellij/util/io/netty.kt
+2 -1
View File
@@ -35,6 +35,7 @@ import io.netty.handler.codec.http.HttpHeaderNames
import io.netty.handler.codec.http.HttpMethod
import io.netty.handler.codec.http.HttpRequest
import io.netty.handler.ssl.SslHandler
import io.netty.resolver.ResolvedAddressTypes
import io.netty.util.concurrent.GenericFutureListener
import org.jetbrains.concurrency.AsyncPromise
import org.jetbrains.concurrency.Promise
@@ -253,7 +254,7 @@ fun isLocalHost(host: String, onlyAnyOrLoopback: Boolean, hostsOnly: Boolean = f
// be aware - on windows hosts file doesn't contain localhost
// hosts can contain remote addresses, so, we check it
if (hostsOnly && !InetAddresses.isInetAddress(host)) {
return io.netty.resolver.HostsFileEntriesResolver.DEFAULT.address(host).let { it != null && it.isLocal() }
return io.netty.resolver.HostsFileEntriesResolver.DEFAULT.address(host, ResolvedAddressTypes.IPV4_PREFERRED).let { it != null && it.isLocal() }
}
else {
return true
platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class BuiltInServer implements Disposable {
static {
// IDEA-120811
if (SystemProperties.getBooleanProperty("io.netty.random.id", true)) {
System.setProperty("io.netty.machineId", "9e43d860");
System.setProperty("io.netty.machineId", "28:f0:76:ff:fe:16:65:0e");
System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));
System.setProperty("io.netty.serviceThreadPrefix", "Netty ");
}