diff -Nru mighttpd2-3.4.3/conf/example.conf mighttpd2-3.4.6/conf/example.conf --- mighttpd2-3.4.3/conf/example.conf 2018-04-26 01:45:52.000000000 +0000 +++ mighttpd2-3.4.6/conf/example.conf 2019-06-25 05:04:17.000000000 +0000 @@ -8,6 +8,7 @@ # If available, "nobody" is much more secure for Group:. Group: root Pid_File: /var/run/mighty.pid +Report_File: /tmp/mighty_report Logging: Yes # Yes or No Log_File: /var/log/mighty # The directory must be writable by User: Log_File_Size: 16777216 # bytes @@ -16,6 +17,7 @@ Index_Cgi: index.cgi Status_File_Dir: /usr/local/share/mighty/status Connection_Timeout: 30 # seconds +Proxy_Timeout: 0 # seconds, 0 is default of http-client, ie 30 seconds Fd_Cache_Duration: 10 # seconds # Server_Name: Mighttpd/3.x.y Tls_Port: 443 diff -Nru mighttpd2-3.4.3/debian/changelog mighttpd2-3.4.6/debian/changelog --- mighttpd2-3.4.3/debian/changelog 2020-02-08 11:07:15.000000000 +0000 +++ mighttpd2-3.4.6/debian/changelog 2020-06-17 00:56:31.000000000 +0000 @@ -1,20 +1,8 @@ -mighttpd2 (3.4.3-2build3) focal; urgency=medium +mighttpd2 (3.4.6-1) unstable; urgency=medium - * No-change rebuild with fixed binutils on arm64. + * New upstream version. - -- Matthias Klose Sat, 08 Feb 2020 11:07:15 +0000 - -mighttpd2 (3.4.3-2build2) focal; urgency=medium - - * No-change rebuild for libffi soname change. - - -- Matthias Klose Sun, 12 Jan 2020 08:51:48 +0000 - -mighttpd2 (3.4.3-2build1) eoan; urgency=medium - - * Rebuild against new GHC abi. - - -- Gianfranco Costamagna Sat, 07 Sep 2019 17:48:05 +0200 + -- Clint Adams Tue, 16 Jun 2020 20:56:31 -0400 mighttpd2 (3.4.3-2) unstable; urgency=medium diff -Nru mighttpd2-3.4.3/debian/control mighttpd2-3.4.6/debian/control --- mighttpd2-3.4.3/debian/control 2018-10-03 09:06:16.000000000 +0000 +++ mighttpd2-3.4.6/debian/control 2020-06-17 00:56:31.000000000 +0000 @@ -18,7 +18,7 @@ libghc-conduit-extra-dev, libghc-http-date-dev, libghc-http-types-dev, - libghc-io-choice-dev, + libghc-http-types-prof, libghc-network-dev, libghc-resourcet-dev, libghc-streaming-commons-dev, @@ -28,18 +28,19 @@ libghc-unordered-containers-dev, libghc-wai-dev (>= 3.2), libghc-wai-dev (<< 3.3), - libghc-wai-app-file-cgi-dev (>= 3.1.1), + libghc-wai-prof, + libghc-wai-app-file-cgi-dev (>= 3.1.9), libghc-wai-app-file-cgi-dev (<< 3.2), - libghc-warp-dev (>= 3.2.21), - libghc-warp-dev (<< 3.3), - libghc-warp-tls-dev (>= 3.2), - libghc-warp-tls-dev (<< 3.3), + libghc-wai-app-file-cgi-prof, + libghc-warp-dev (>= 3.3), + libghc-warp-dev (<< 3.4), + libghc-warp-prof, libghc-http-client-dev (>= 0.5), libghc-old-locale-dev, libghc-tls-dev, libghc-wai-http2-extra-dev (>= 0.1), libghc-wai-logger-dev (>= 2.3.0), - libghc-warp-dev (>= 3.2.7), + libghc-wai-logger-prof, libghc-hspec-dev (>= 1.3), Build-Depends-Indep: ghc-doc, libghc-async-doc, @@ -50,7 +51,6 @@ libghc-conduit-extra-doc, libghc-http-date-doc, libghc-http-types-doc, - libghc-io-choice-doc, libghc-network-doc, libghc-resourcet-doc, libghc-streaming-commons-doc, @@ -59,7 +59,7 @@ libghc-wai-doc, libghc-wai-app-file-cgi-doc, libghc-warp-doc, -Standards-Version: 4.1.4 +Standards-Version: 4.5.0 Homepage: http://www.mew.org/~kazu/proj/mighttpd/ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/mighttpd2 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/mighttpd2] diff -Nru mighttpd2-3.4.3/mighttpd2.cabal mighttpd2-3.4.6/mighttpd2.cabal --- mighttpd2-3.4.3/mighttpd2.cabal 2018-04-26 01:45:52.000000000 +0000 +++ mighttpd2-3.4.6/mighttpd2.cabal 2019-06-25 05:04:17.000000000 +0000 @@ -1,5 +1,5 @@ Name: mighttpd2 -Version: 3.4.3 +Version: 3.4.6 Author: Kazu Yamamoto Maintainer: Kazu Yamamoto License: BSD3 @@ -33,7 +33,7 @@ Program.Mighty.Resource Program.Mighty.Route Program.Mighty.Signal - Build-Depends: base >= 4.0 && < 5 + Build-Depends: base >= 4.9 && < 5 , array , async , auto-update @@ -46,7 +46,6 @@ , filepath , http-date , http-types - , io-choice , network , parsec >= 3 , resourcet @@ -55,8 +54,10 @@ , unix-time , unordered-containers , wai >= 3.2 && < 3.3 - , wai-app-file-cgi >= 3.1.1 && < 3.2 - , warp >= 3.2.21 && < 3.3 + , wai-app-file-cgi >= 3.1.9 && < 3.2 + , warp >= 3.3 && < 3.4 + if impl(ghc >= 8) + Default-Extensions: Strict StrictData Executable mighty Default-Language: Haskell2010 @@ -66,7 +67,7 @@ if flag(tls) Cpp-Options: -DHTTP_OVER_TLS Build-Depends: async - , tls-session-manager + , tls-session-manager >= 0.0.2.0 Build-Depends: base >= 4.0 && < 5 , bytestring , directory @@ -81,16 +82,18 @@ , unix , streaming-commons , wai >= 3.2 && < 3.3 - , wai-app-file-cgi >= 3.1.1 && < 3.2 + , wai-app-file-cgi >= 3.1.9 && < 3.2 , wai-logger >= 2.3.0 - , warp >= 3.2.7 && < 3.3 + , warp >= 3.3 && < 3.4 , wai-http2-extra >= 0.1 if flag(tls) Build-Depends: tls - , warp-tls >= 3.2 && < 3.3 + , warp-tls >= 3.2.7 && < 3.3 Other-Modules: Server WaiApp Paths_mighttpd2 + if impl(ghc >= 8) + Default-Extensions: Strict StrictData Executable mighty-mkindex Default-Language: Haskell2010 @@ -111,6 +114,8 @@ Build-Depends: base >= 4 && < 5 , unix , mighttpd2 + if impl(ghc >= 8) + Default-Extensions: Strict StrictData Test-Suite spec Default-Language: Haskell2010 @@ -125,7 +130,9 @@ , http-client >= 0.5 if flag(tls) Build-Depends: tls - , warp-tls >= 3.2 && < 3.3 + , warp-tls >= 3.2.7 && < 3.3 + if impl(ghc >= 8) + Default-Extensions: Strict StrictData Source-Repository head Type: git diff -Nru mighttpd2-3.4.3/Program/Mighty/Config.hs mighttpd2-3.4.6/Program/Mighty/Config.hs --- mighttpd2-3.4.3/Program/Mighty/Config.hs 2018-04-26 01:45:52.000000000 +0000 +++ mighttpd2-3.4.6/Program/Mighty/Config.hs 2019-06-25 05:04:17.000000000 +0000 @@ -29,6 +29,7 @@ , opt_user = "root" , opt_group = "root" , opt_pid_file = "/var/run/mighty.pid" + , opt_report_file = "/tmp/mighty_report" , opt_logging = True , opt_log_file = "/var/log/mighty" , opt_log_file_size = 16777216 @@ -44,9 +45,8 @@ , opt_tls_port = 443 , opt_tls_cert_file = "cert.pem" , opt_tls_chain_files = "chain.pem" - , opt_tls_key_file = "key.pem" + , opt_tls_key_file = "privkey.pem" , opt_service = 0 - , opt_report_file = "/tmp/mighty_report" } data Option = Option { @@ -56,6 +56,7 @@ , opt_user :: !String , opt_group :: !String , opt_pid_file :: !FilePath + , opt_report_file :: !FilePath , opt_logging :: !Bool , opt_log_file :: !FilePath , opt_log_file_size :: !Int @@ -73,7 +74,6 @@ , opt_tls_chain_files :: !FilePath , opt_tls_key_file :: !FilePath , opt_service :: !Int - , opt_report_file :: !FilePath } deriving (Eq,Show) ---------------------------------------------------------------- @@ -92,6 +92,7 @@ , opt_user = get "User" opt_user , opt_group = get "Group" opt_group , opt_pid_file = get "Pid_File" opt_pid_file + , opt_report_file = get "Report_File" opt_report_file , opt_logging = get "Logging" opt_logging , opt_log_file = get "Log_File" opt_log_file , opt_log_file_size = get "Log_File_Size" opt_log_file_size @@ -109,7 +110,6 @@ , opt_tls_chain_files = get "Tls_Chain_Files" opt_tls_chain_files , opt_tls_key_file = get "Tls_Key_File" opt_tls_key_file , opt_service = get "Service" opt_service - , opt_report_file = get "ReportFile" opt_report_file } where get k func = maybe (func def) fromConf $ lookup k conf diff -Nru mighttpd2-3.4.3/src/Server.hs mighttpd2-3.4.6/src/Server.hs --- mighttpd2-3.4.3/src/Server.hs 2018-04-26 01:45:52.000000000 +0000 +++ mighttpd2-3.4.6/src/Server.hs 2019-06-25 05:04:17.000000000 +0000 @@ -11,7 +11,7 @@ import Data.List (dropWhile, dropWhileEnd, break) #endif import Data.Streaming.Network (bindPortTCP) -import Network (Socket, sClose) +import Network.Socket (Socket, close) import qualified Network.HTTP.Client as H import Network.Wai.Application.Classic hiding (()) import Network.Wai.Handler.Warp @@ -142,7 +142,7 @@ key <- BS.readFile $ opt_tls_key_file _opt let settings0 = tlsSettingsChainMemory cert chains key settings = settings0 { - tlsSessionManagerConfig = Just defaultConfig + tlsSessionManagerConfig = Just defaultConfig { dbMaxSize = 1000 } } return settings #else @@ -218,17 +218,17 @@ openService opt | service == 1 = do s <- bindPortTCP httpsPort hostpref - debugMessage $ "HTTP/TLS service on port " ++ show httpsPort ++ "." + debugMessage $ urlForHTTPS httpsPort return $ HttpsOnly s | service == 2 = do s1 <- bindPortTCP httpPort hostpref s2 <- bindPortTCP httpsPort hostpref - debugMessage $ "HTTP service on port " ++ show httpPort ++ " and " - ++ "HTTP/TLS service on port " ++ show httpsPort ++ "." + debugMessage $ urlForHTTP httpPort + debugMessage $ urlForHTTPS httpsPort return $ HttpAndHttps s1 s2 | otherwise = do s <- bindPortTCP httpPort hostpref - debugMessage $ "HTTP service on port " ++ show httpPort ++ "." + debugMessage $ urlForHTTP httpPort return $ HttpOnly s where httpPort = opt_port opt @@ -239,13 +239,18 @@ debugMessage msg = when debug $ do putStrLn msg hFlush stdout + urlForHTTP 80 = "http://localhost/" + urlForHTTP p = "http://localhost:" ++ show p ++ "/" + urlForHTTPS 443 = "https://localhost/" + urlForHTTPS p = "https://localhost:" ++ show p ++ "/" + ---------------------------------------------------------------- closeService :: Service -> IO () -closeService (HttpOnly s) = sClose s -closeService (HttpsOnly s) = sClose s -closeService (HttpAndHttps s1 s2) = sClose s1 >> sClose s2 +closeService (HttpOnly s) = close s +closeService (HttpsOnly s) = close s +closeService (HttpAndHttps s1 s2) = close s1 >> close s2 ----------------------------------------------------------------