happstack-server 6.5.1 → 6.5.2

raw patch · 4 files changed

+11/−11 lines, 4 files

Files

happstack-server.cabal +5/−5
src/Happstack/Server/Internal/TLS.hs +3/−3
src/Happstack/Server/Internal/Types.hs +1/−1
src/Happstack/Server/Routing.hs +2/−2

happstack-server.cabal view

@@ -1,5 +1,5 @@ Name:                happstack-server-Version:             6.5.1+Version:             6.5.2 Synopsis:            Web related tools and services. Description:         Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course <http://happstack.com/docs/crashcourse/index.html> License:             BSD3@@ -27,9 +27,9 @@     Description: Build the testsuite, and include the tests in the library     Default: False -Flag disable-https+Flag https      Description: Compile server with out https:// support-     Default: False+     Default: True      Manual: True  Library@@ -107,12 +107,12 @@                        utf8-string >= 0.3.4 && < 0.4,                        xhtml,                        zlib-  if !flag(disable-https)+  if flag(https)     Exposed-modules:                        Happstack.Server.Internal.TimeoutSocketTLS     Build-Depends:                        HsOpenSSL == 0.10.*-    Extra-Libraries:   crypto++ ssl+    Extra-Libraries:   cryptopp ssl   else     CPP-Options:       -DDISABLE_HTTPS

src/Happstack/Server/Internal/TLS.hs view

@@ -13,7 +13,7 @@ import qualified OpenSSL.Session as SSL #endif --- | configuration for using https://+-- | configuration for using https:\/\/ data TLSConf = TLSConf {       tlsPort :: Int        -- port (usually 443)     , tlsCert :: FilePath   -- path to SSL certificate@@ -29,7 +29,7 @@ httpsOnSocket = error "happstack-server was compiled with disable_https." #else -- | record that holds the 'Socket' and 'SSLContext' needed to start--- the https:// event loop. Used with 'simpleHTTPWithSocket''+-- the https:\/\/ event loop. Used with 'simpleHTTPWithSocket'' -- -- see also: 'httpOnSocket' data HTTPS = HTTPS@@ -37,7 +37,7 @@     , sslContext :: SSLContext     } --- | generate the 'HTTPS' record needed to start the https:// event loop+-- | generate the 'HTTPS' record needed to start the https:\/\/ event loop -- httpsOnSocket :: FilePath  -- ^ path to ssl certificate               -> FilePath  -- ^ path to ssl private key

src/Happstack/Server/Internal/Types.hs view

@@ -211,7 +211,7 @@  -- | an HTTP request data Request = Request-    { rqSecure        :: Bool                  -- ^ request uses https://+    { rqSecure        :: Bool                  -- ^ request uses https:\/\/       , rqMethod      :: Method                -- ^ request method       , rqPaths       :: [String]              -- ^ the uri, split on /, and then decoded       , rqUri         :: String                -- ^ the raw rqUri

src/Happstack/Server/Routing.hs view

@@ -55,7 +55,7 @@     unless (f rq) mzero  --- | guard which checks that an insecure connection was made via http://+-- | guard which checks that an insecure connection was made via http:\/\/ -- -- Example: --@@ -67,7 +67,7 @@ http = guardRq (not . rqSecure)  --- | guard which checks that a secure connection was made via https://+-- | guard which checks that a secure connection was made via https:\/\/ -- -- Example: --