git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge branch 'master' into pure11-0.9
commit843a5423006fc5ecd7ba3313334b5510dfc29a1d authorAndy Arvanitis <andyarvanitis@gmail.com> dateTue 10 May 2016, 22:16 (10 years ago) parentece2ea5102eb6a
3 files changed+7−4
compare with golang
unifiedsplit
CONTRIBUTORS.md+1 psc-ide-client/Main.hs+1−1 psc-ide-server/Main.hs+5−3
CONTRIBUTORS.md+1
@@ -31,6 +31,7 @@ This file lists the contributors to the PureScript compiler project, and the ter
3131- [@jacereda](https://github.com/jacereda) (Jorge Acereda) My existing contributions and all future contributions until further notice are Copyright Jorge Acereda, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
3232- [@japesinator](https://github.com/japesinator) (JP Smith) My existing contributions and all future contributions until further notice are Copyright JP Smith, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
3333- [@joneshf](https://github.com/joneshf) (Hardy Jones) - My existing contributions and all future contributions until further notice are Copyright Hardy Jones, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.
34+- [@kika](https://github.com/kika) (Kirill Pertsev) - My existing contributions and all future contributions until further notice are Copyright Kirill Pertsev, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.
3435- [@kRITZCREEK](https://github.com/kRITZCREEK) (Christoph Hegemann) - My existing contributions and all future contributions until further notice are Copyright Christoph Hegemann, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.
3536- [@L8D](https://github.com/L8D) (Tenor Biel) My existing contributions and all future contributions until further notice are Copyright Tenor Biel, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
3637- [@leighman](http://github.com/leighman) (Jack Leigh) My existing contributions and all future contributions until further notice are Copyright Jack Leigh, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
psc-ide-client/Main.hs+1−1
@@ -35,7 +35,7 @@ main = do
3535client :: PortID -> IO ()
3636client port = do
3737 h <-
38− connectTo "localhost" port `catch`
38+ connectTo "127.0.0.1" port `catch`
3939 (\(SomeException e) ->
4040 putStrLn
4141 ("Couldn't connect to psc-ide-server on port: " ++
psc-ide-server/Main.hs+5−3
@@ -39,10 +39,10 @@ import Language.PureScript.Ide.Util
3939import Language.PureScript.Ide.Error
4040import Language.PureScript.Ide.Types
4141import Language.PureScript.Ide.Watcher
42−import Network hiding (socketPort)
42+import Network hiding (socketPort, accept)
4343import Network.BSD (getProtocolNumber)
4444import Network.Socket hiding (PortNumber, Type,
45− accept, sClose)
45+ sClose)
4646import Options.Applicative
4747import System.Directory
4848import System.FilePath
@@ -166,7 +166,9 @@ acceptCommand sock = do
166166 pure (cmd, h)
167167 where
168168 acceptConnection = liftIO $ do
169− (h,_,_) <- accept sock
169+ -- Use low level accept to prevent accidental reverse name resolution
170+ (s,_) <- accept sock
171+ h <- socketToHandle s ReadWriteMode
170172 hSetEncoding h utf8
171173 hSetBuffering h LineBuffering
172174 pure h