diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-10 09:49:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 09:49:56 -0500 |
| commit | 43f3b6097fbc5bb17f281dae123553ee52ee0a37 (patch) | |
| tree | 3e6aba78db9452803edf552189e8659faf2d0b6a /MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs | |
| parent | b580209848e25f9de597a9797eae7a8813c4e3ab (diff) | |
| parent | 9b891f2c9a4f37e2a914dc8fc5faba4e919e2b8f (diff) | |
Merge pull request #2279 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs index 5da515900..abcf84abd 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs @@ -6,6 +6,7 @@ using MediaBrowser.Model.Cryptography; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Net; +using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Text; namespace MediaBrowser.Server.Implementations.HttpServer @@ -28,9 +29,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer string defaultRedirectpath, ITextEncoding textEncoding, ISocketFactory socketFactory, - ICryptoProvider cryptoProvider) + ICryptoProvider cryptoProvider, + IJsonSerializer json, + IXmlSerializer xml) { - return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider); + return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider, json, xml); } } } |
