-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixup! KTOR-6004 Support TCP and Unix socket for wasm-js and js via N…
…odeJS (#4411)
- Loading branch information
Showing
8 changed files
with
20 additions
and
40 deletions.
There are no files selected for viewing
6 changes: 1 addition & 5 deletions
6
ktor-network/jsAndWasmShared/src/io/ktor/network/selector/Selectable.jsAndWasmShared.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,7 @@ | ||
/* | ||
* Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
* Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package io.ktor.network.selector | ||
|
||
import io.ktor.network.util.* | ||
|
||
public actual interface Selectable | ||
|
||
internal actual fun Any.supportsUnixDomainSockets(): Boolean = isAFUnixSupported |
7 changes: 7 additions & 0 deletions
7
ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.jsAndWasmShared.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
/* | ||
* Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package io.ktor.network.sockets.tests | ||
|
||
internal actual fun Any.supportsUnixDomainSockets(): Boolean = false |
7 changes: 0 additions & 7 deletions
7
ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.kt
This file was deleted.
Oops, something went wrong.
4 changes: 3 additions & 1 deletion
4
...tor/network/sockets/tests/TestUtilsIos.kt → ...or/network/sockets/tests/TestUtils.nix.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
/* | ||
* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
* Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package io.ktor.network.sockets.tests | ||
|
||
import io.ktor.network.util.* | ||
|
||
internal actual fun Any.supportsUnixDomainSockets(): Boolean = true |
13 changes: 0 additions & 13 deletions
13
ktor-network/posix/test/io/ktor/network/sockets/tests/TestUtils.posix.kt
This file was deleted.
Oops, something went wrong.
7 changes: 0 additions & 7 deletions
7
ktor-network/tvos/test/io/ktor/network/sockets/tests/TestUtilsTvos.kt
This file was deleted.
Oops, something went wrong.
7 changes: 0 additions & 7 deletions
7
ktor-network/watchos/test/io/ktor/network/sockets/tests/TestUtilsWatchos.kt
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
ktor-network/windows/test/io/ktor/network/sockets/tests/TestUtils.windows.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
/* | ||
* Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package io.ktor.network.sockets.tests | ||
|
||
import io.ktor.network.util.* | ||
|
||
internal actual fun Any.supportsUnixDomainSockets(): Boolean = isAFUnixSupported |