Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dune-rpc: use loopback address on Windows #7666

Merged
merged 3 commits into from
May 3, 2023
Merged

dune-rpc: use loopback address on Windows #7666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8917d66
dune-rpc: use loopback address on Windows
nojb May 3, 2023
f917d6b
Format, CHANGES
nojb May 3, 2023
30c3795
Merge branch 'main' into fix_rpc_windows
nojb May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ Unreleased
- Introduce mdx stanza 0.4 requiring mdx >= 2.3.0 which updates the default
list of files to include `*.mld` files (#7582, @Leonidas-from-XIV)

- Fix RPC server on Windows (used for OCaml-LSP). (#7666, @nojb)

3.7.1 (2023-04-04)
------------------

Expand Down
5 changes: 4 additions & 1 deletion otherlibs/dune-rpc/private/where.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ end) (IO : sig
string -> ([ `Unix_socket | `Normal_file | `Other ], exn) result Fiber.t
end) : S with type 'a fiber := 'a Fiber.t = struct
let default ?(win32 = win32) ~build_dir () =
if win32 then `Ip (`Host "0.0.0.0", `Port default_port)
if win32 then
`Ip
( `Host (Unix.string_of_inet_addr Unix.inet_addr_loopback)
, `Port default_port )
else `Unix (Filename.concat build_dir rpc_socket_relative_to_build_dir)

let ( let** ) x f =
Expand Down