Permalink
Browse files

Merge branch 'master' of git.snapframework.com:snap-server

  • Loading branch information...
2 parents d28b2e4 + 6b2567f commit e6b6b54e894346b463856c596034944a45f18d6c @gregorycollins gregorycollins committed Jan 8, 2011
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/Snap/Http/Server/Config.hs
@@ -70,10 +70,10 @@ data ConfigListen = ListenHttp ByteString Int
instance Show ConfigListen where
- show (ListenHttp b p) = "http(" ++ show b ++ ":" ++ show p ++ ")"
- show (ListenHttps b p c k) = "https(" ++ show b ++ ":" ++ show p ++
- ", cert = " ++ show c ++
- ", key = " ++ show k ++ ")"
+ show (ListenHttp b p) = "http://" ++ U.toString b ++ ":" ++ show p
+ show (ListenHttps b p c k) =
+ "https://" ++ U.toString b ++ ":" ++ show p ++
+ " (cert = " ++ show c ++ ", key = " ++ show k ++ ")"
------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ data ConfigBackend = ConfigSimpleBackend
-- by wrapping all of its fields in a 'Maybe'. Values of this type are usually
-- constructed via its 'Monoid' instance by doing something like:
--
--- > setPort 9000 mempty
+-- > addListen (ListenHttp "0.0.0.0" 9000) mempty
--
-- Any fields which are unspecified in the 'Config' passed to 'httpServe' (and
-- this is the norm) are filled in with default values from 'defaultConfig'.

0 comments on commit e6b6b54

Please sign in to comment.