diff --git a/IISExpress/AppServer/applicationhost.config b/IISExpress/AppServer/applicationhost.config
index ac36581f6..8572e13c6 100644
--- a/IISExpress/AppServer/applicationhost.config
+++ b/IISExpress/AppServer/applicationhost.config
@@ -9,11 +9,11 @@
Please make a backup of this file before making any changes to it.
NOTE: The following environment variables are available to be used
- within this file and are understood by the IIS Development Express.
+ within this file and are understood by the IIS Express.
- %IIS_USER_HOME% - The IIS Development Express home directory for the user
+ %IIS_USER_HOME% - The IIS Express home directory for the user
%IIS_SITES_HOME% - The default home directory for sites
- %IIS_BIN% - The location of the IIS Development Express binaries
+ %IIS_BIN% - The location of the IIS Express binaries
%SYSTEMDRIVE% - The drive letter of %IIS_BIN%
-->
@@ -116,18 +116,15 @@
+
-
diff --git a/IISExpress/AppServer/redirection.config b/IISExpress/AppServer/redirection.config
new file mode 100644
index 000000000..270935794
--- /dev/null
+++ b/IISExpress/AppServer/redirection.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IISExpress/IisExpressAdminCmd.exe b/IISExpress/IisExpressAdminCmd.exe
index 4e14aa1da..bd15274a4 100644
Binary files a/IISExpress/IisExpressAdminCmd.exe and b/IISExpress/IisExpressAdminCmd.exe differ
diff --git a/IISExpress/IisExpressadminCmd.resources.dll b/IISExpress/IisExpressadminCmd.resources.dll
new file mode 100644
index 000000000..9decd5b0b
Binary files /dev/null and b/IISExpress/IisExpressadminCmd.resources.dll differ
diff --git a/IISExpress/Release_Notes.url b/IISExpress/Release_Notes.url
new file mode 100644
index 000000000..236ac8527
--- /dev/null
+++ b/IISExpress/Release_Notes.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://go.microsoft.com/fwlink/?LinkId=207675
+IDList=
diff --git a/IISExpress/WCFWebMatrixInstall.js b/IISExpress/WCFWebMatrixInstall.js
deleted file mode 100644
index 5a2a49738..000000000
--- a/IISExpress/WCFWebMatrixInstall.js
+++ /dev/null
@@ -1,181 +0,0 @@
-// Configures Windows Communication Foundation 3.5 for WebMatrix
-//
-// Usage:
-// WCFWebMatrixInstall.js [un]install
-
-var moduleName = "ServiceModel";
-var handlerNames = ["svc-Integrated","rules-Integrated","xoml-Integrated","svc-ISAPI-2.0","rules-ISAPI-2.0","xoml-ISAPI-2.0"];
-
-try {
- var mode = ParseArguments();
- if (mode == "install")
- {
- UninstallWCF();
- InstallWCF();
- WScript.Echo("WCF 3.5 has been configured for WebMatrix.");
- }
- else if (mode == "uninstall")
- {
- UninstallWCF();
- WScript.Echo("WCF 3.5 has been uninstalled from WebMatrix.");
- }
- else
- {
- PrintUsage();
- }
-}
-catch(e) {
- WScript.Echo("An error occurred:\r\n " + e.description);
-}
-
-function InstallWCF() {
- var adminManager = GetAdminManager();
-
- AddModule(adminManager);
- AddHandlers(adminManager);
-
- adminManager.CommitChanges();
-}
-
-function UninstallWCF() {
- var adminManager = GetAdminManager();
- var moduleSection = adminManager.GetAdminSection("system.webServer/modules", "MACHINE/WEBROOT/APPHOST");
-
- var modulePosition = FindElement(moduleSection.Collection, "add", ["name", moduleName]);
- if (modulePosition != -1)
- {
- moduleSection.Collection.DeleteElement(modulePosition);
- }
-
- var handlerSection = adminManager.GetAdminSection("system.webServer/handlers", "MACHINE/WEBROOT/APPHOST");
- for (i = 0 ; i < handlerNames.length; i++)
- {
- var svcPosition = FindElement(handlerSection.Collection, "add", ["name", handlerNames[i]]);
- if (svcPosition != -1)
- {
- handlerSection.Collection.DeleteElement(svcPosition);
- }
- }
-
- adminManager.CommitChanges();
-}
-
-function AddModule(adminManager)
-{
- var moduleSection = adminManager.GetAdminSection("system.webServer/modules", "MACHINE/WEBROOT/APPHOST");
-
- var element = moduleSection.Collection.CreateNewElement("add");
- element.Properties.Item("name").Value = moduleName;
- element.Properties.Item("type").Value = "System.ServiceModel.Activation.HttpModule, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
- element.Properties.Item("preCondition").Value = "managedHandler,runtimeVersionv2.0";
- moduleSection.Collection.AddElement(element, -1);
-}
-
-function AddHandlers(adminManager)
-{
- var handlerSection = adminManager.GetAdminSection("system.webServer/handlers", "MACHINE/WEBROOT/APPHOST");
-
- AddIntegratedHandler(handlerSection, handlerNames[0], "*.svc");
- AddIntegratedHandler(handlerSection, handlerNames[1], "*.rules");
- AddIntegratedHandler(handlerSection, handlerNames[2], "*.xoml");
-
- AddISAPIHandler(handlerSection, handlerNames[3], "*.svc");
- AddISAPIHandler(handlerSection, handlerNames[4], "*.rules");
- AddISAPIHandler(handlerSection, handlerNames[5], "*.xoml");
-}
-
-function AddIntegratedHandler(section, name, path)
-{
- var element = section.Collection.CreateNewElement("add");
- element.Properties.Item("name").Value = name;
- element.Properties.Item("path").Value = path;
- element.Properties.Item("verb").Value = "*";
- element.Properties.Item("type").Value = "System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
- element.Properties.Item("preCondition").Value = "integratedMode,runtimeVersionv2.0";
- section.Collection.AddElement(element, 0);
-}
-
-function AddISAPIHandler(section, name, path)
-{
- var element = section.Collection.CreateNewElement("add");
- element.Properties.Item("name").Value = name;
- element.Properties.Item("path").Value = path;
- element.Properties.Item("verb").Value = "*";
- element.Properties.Item("modules").Value = "IsapiModule";
- element.Properties.Item("scriptProcessor").Value = "%SystemRoot%\\Microsoft.NET\\Framework\\v2.0.50727\\aspnet_isapi.dll";
- element.Properties.Item("preCondition").Value = "classicMode,runtimeVersionv2.0,bitness32";
- section.Collection.AddElement(element, 0);
-}
-
-function GetAdminManager()
-{
- try
- {
- var vermg = new ActiveXObject("Microsoft.IIS.VersionManager");
- var exp = vermg.GetVersionObject("8.0", 1);
- return adminManager = exp.CreateObjectFromProgId("Microsoft.ApplicationHost.WritableAdminManager");
- }
- catch(e)
- {
- throw new Error("Unable to create WritableAdminManager.\r\n Please ensure that WebMatrix is installed properly.\r\n\r\n " + e.description);
- }
-}
-
-function FindElement(collection, elementTagName, valuesToMatch)
-{
- for (var i = 0; i < collection.Count; i++)
- {
- var element = collection.Item(i);
-
- if (element.Name == elementTagName)
- {
- var matches = true;
- for (var iVal = 0; iVal < valuesToMatch.length; iVal += 2)
- {
- var property = element.GetPropertyByName(valuesToMatch[iVal]);
- var value = property.Value;
- if (value != null)
- {
- value = value.toString();
- }
- if (value != valuesToMatch[iVal + 1])
- {
- matches = false;
- break;
- }
- }
- if (matches)
- {
- return i;
- }
- }
- }
-
- return -1;
-}
-
-function ParseArguments()
-{
- var mode = "";
-
- if (WScript.Arguments.Count() > 0)
- {
- if (WScript.Arguments.Item(0).toLowerCase() == "install")
- {
- mode="install";
- }
- else if (WScript.Arguments.Item(0).toLowerCase() == "uninstall")
- {
- mode="uninstall";
- }
- }
-
- return mode;
-}
-
-function PrintUsage()
-{
- WScript.Echo("Usage:\r\n WCFWebMatrixInstall.js \r\n\r\nDescription:\r\nAdministration utility that enables configuation of WCF 3.5 for WebMatrix\r\n\r\nSupported Commands:\r\n install, uninstall\r\n\r\nSamples:\r\n WCFWebMatrixInstall.js install\r\n WCFWebMatrixInstall.js uninstall");
-}
-
-
diff --git a/IISExpress/appcmd.exe b/IISExpress/appcmd.exe
index 36edd87ea..116ba4e7c 100644
Binary files a/IISExpress/appcmd.exe and b/IISExpress/appcmd.exe differ
diff --git a/IISExpress/appobj.dll b/IISExpress/appobj.dll
index 3a83de4d6..fd9c67017 100644
Binary files a/IISExpress/appobj.dll and b/IISExpress/appobj.dll differ
diff --git a/IISExpress/authanon.dll b/IISExpress/authanon.dll
index f41db8284..0c7ab8b74 100644
Binary files a/IISExpress/authanon.dll and b/IISExpress/authanon.dll differ
diff --git a/IISExpress/authbas.dll b/IISExpress/authbas.dll
index 4df969b62..aed3d396a 100644
Binary files a/IISExpress/authbas.dll and b/IISExpress/authbas.dll differ
diff --git a/IISExpress/authcert.dll b/IISExpress/authcert.dll
index 5ae84df4a..99bcb714c 100644
Binary files a/IISExpress/authcert.dll and b/IISExpress/authcert.dll differ
diff --git a/IISExpress/authmap.dll b/IISExpress/authmap.dll
index 94d259ad4..f4cb73193 100644
Binary files a/IISExpress/authmap.dll and b/IISExpress/authmap.dll differ
diff --git a/IISExpress/authsspi.dll b/IISExpress/authsspi.dll
index b0bf4301b..e7ac5de73 100644
Binary files a/IISExpress/authsspi.dll and b/IISExpress/authsspi.dll differ
diff --git a/IISExpress/browscap.dll b/IISExpress/browscap.dll
index 832812e4c..40df623f7 100644
Binary files a/IISExpress/browscap.dll and b/IISExpress/browscap.dll differ
diff --git a/IISExpress/cachtokn.dll b/IISExpress/cachtokn.dll
index 10c50071c..c175a5f90 100644
Binary files a/IISExpress/cachtokn.dll and b/IISExpress/cachtokn.dll differ
diff --git a/IISExpress/cachuri.dll b/IISExpress/cachuri.dll
index 8ed2e8461..65afc8d8a 100644
Binary files a/IISExpress/cachuri.dll and b/IISExpress/cachuri.dll differ
diff --git a/IISExpress/cgi.dll b/IISExpress/cgi.dll
index 0da8bdc8f..9317434b7 100644
Binary files a/IISExpress/cgi.dll and b/IISExpress/cgi.dll differ
diff --git a/IISExpress/compdyn.dll b/IISExpress/compdyn.dll
index 4ce172958..e74c4c753 100644
Binary files a/IISExpress/compdyn.dll and b/IISExpress/compdyn.dll differ
diff --git a/IISExpress/compstat.dll b/IISExpress/compstat.dll
index 760217ef6..23b84ce65 100644
Binary files a/IISExpress/compstat.dll and b/IISExpress/compstat.dll differ
diff --git a/IISExpress/config/administration.config b/IISExpress/config/administration.config
new file mode 100644
index 000000000..8fe2cfede
--- /dev/null
+++ b/IISExpress/config/administration.config
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IISExpress/config/schema/IIS_schema.xml b/IISExpress/config/schema/IIS_schema.xml
index 10c4a1011..47adadeee 100644
--- a/IISExpress/config/schema/IIS_schema.xml
+++ b/IISExpress/config/schema/IIS_schema.xml
@@ -119,7 +119,7 @@
-
+
@@ -212,7 +212,7 @@
-
+
@@ -468,7 +468,7 @@
-
+
@@ -481,7 +481,7 @@
-
+
@@ -502,7 +502,7 @@
-
+
@@ -588,7 +588,7 @@
-
+
@@ -990,7 +990,7 @@
-
+
@@ -1016,7 +1016,7 @@
-
+
@@ -1078,14 +1078,14 @@
-
+
-
+
@@ -1372,7 +1372,7 @@
-
+
@@ -1386,9 +1386,9 @@
-
+
-
+
diff --git a/IISExpress/config/schema/NetFx40_IIS_schema_update.xml b/IISExpress/config/schema/NetFx40_IIS_schema_update.xml
new file mode 100644
index 000000000..b51dd2f3a
--- /dev/null
+++ b/IISExpress/config/schema/NetFx40_IIS_schema_update.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IISExpress/config/schema/xhtml1-transitional.xsd b/IISExpress/config/schema/xhtml1-transitional.xsd
deleted file mode 100644
index 8ce44fb9a..000000000
--- a/IISExpress/config/schema/xhtml1-transitional.xsd
+++ /dev/null
@@ -1,2755 +0,0 @@
-
-
-
-
-
- XHTML 1.0 (Second Edition) Transitional in XML Schema
-
- This is the same as HTML 4 Transitional except for
- changes due to the differences between XML and SGML.
-
- Namespace = http://www.w3.org/1999/xhtml
-
- For further information, see: http://www.w3.org/TR/xhtml1
-
- Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
-
- The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
- $Id: xhtml1-transitional.xsd,v 1.5 2002/08/28 09:53:29 mimasa Exp $
-
-
-
-
-
-
-
- ================ Character mnemonic entities =========================
-
- XHTML entity sets are identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent"
-
- PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
-
- PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
-
-
-
-
-
- ================== Imported Names ====================================
-
-
-
-
-
-
- media type, as per [RFC2045]
-
-
-
-
-
-
-
-
- comma-separated list of media types, as per [RFC2045]
-
-
-
-
-
-
-
-
- a character encoding, as per [RFC2045]
-
-
-
-
-
-
-
-
- a space separated list of character encodings, as per [RFC2045]
-
-
-
-
-
-
-
-
- a language code, as per [RFC3066]
-
-
-
-
-
-
-
-
- a single character, as per section 2.2 of [XML]
-
-
-
-
-
-
-
-
-
-
- one or more digits
-
-
-
-
-
-
-
-
-
-
- tabindex attribute specifies the position of the current element
- in the tabbing order for the current document. This value must be
- a number between 0 and 32767. User agents should ignore leading zeros.
-
-
-
-
-
-
-
-
-
-
-
- space-separated list of link types
-
-
-
-
-
-
-
-
- single or comma-separated list of media descriptors
-
-
-
-
-
-
-
-
-
-
- a Uniform Resource Identifier, see [RFC2396]
-
-
-
-
-
-
-
-
- a space separated list of Uniform Resource Identifiers
-
-
-
-
-
-
-
-
- date and time information. ISO date format
-
-
-
-
-
-
-
-
- script expression
-
-
-
-
-
-
-
-
- style sheet data
-
-
-
-
-
-
-
-
- used for titles etc.
-
-
-
-
-
-
-
-
- render in this frame
-
-
-
-
-
-
-
-
-
-
- nn for pixels or nn% for percentage length
-
-
-
-
-
-
-
-
-
-
- pixel, percentage, or relative
-
-
-
-
-
-
-
-
-
-
- integer representing length in pixels
-
-
-
-
-
-
-
- these are used for image maps
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- comma separated list of lengths
-
-
-
-
-
-
-
-
-
-
- used for object, applet, img, input and iframe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- a color using sRGB: #RRGGBB as Hex values
-
- There are also 16 widely known color names with their sRGB values:
-
- Black = #000000 Green = #008000
- Silver = #C0C0C0 Lime = #00FF00
- Gray = #808080 Olive = #808000
- White = #FFFFFF Yellow = #FFFF00
- Maroon = #800000 Navy = #000080
- Red = #FF0000 Blue = #0000FF
- Purple = #800080 Teal = #008080
- Fuchsia= #FF00FF Aqua = #00FFFF
-
-
-
-
-
-
-
-
-
- =================== Generic Attributes ===============================
-
-
-
-
-
-
- core attributes common to most elements
- id document-wide unique id
- class space separated list of classes
- style associated style info
- title advisory title/amplification
-
-
-
-
-
-
-
-
-
-
-
- internationalization attributes
- lang language code (backwards compatible)
- xml:lang language code (as per XML 1.0 spec)
- dir direction for weak/neutral text
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- attributes for common UI events
- onclick a pointer button was clicked
- ondblclick a pointer button was double clicked
- onmousedown a pointer button was pressed down
- onmouseup a pointer button was released
- onmousemove a pointer was moved onto the element
- onmouseout a pointer was moved away from the element
- onkeypress a key was pressed and released
- onkeydown a key was pressed down
- onkeyup a key was released
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- attributes for elements that can get the focus
- accesskey accessibility key character
- tabindex position in tabbing order
- onfocus the element got the focus
- onblur the element lost the focus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text alignment for p, div, h1-h6. The default is
- align="left" for ltr headings, "right" for rtl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Text Elements ====================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- these can only occur at block level
-
-
-
-
-
-
-
-
-
-
-
-
- these can only occur at block level
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "Inline" covers inline or "text-level" element
-
-
-
-
-
-
-
-
-
-
- ================== Block level elements ==============================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "Flow" mixes block and inline and is used for list items etc.
-
-
-
-
-
-
-
-
-
-
-
-
- ================== Content models for exclusions =====================
-
-
-
-
-
-
- a elements use "Inline" excluding a
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- pre uses "Inline" excluding img, object, applet, big, small,
- font, or basefont
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- form uses "Flow" excluding form
-
-
-
-
-
-
-
-
-
-
-
-
- button uses "Flow" but excludes a, form, form controls, iframe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================ Document Structure ==================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================ Document Head =======================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- content model is "head.misc" combined with a single
- title and an optional base element in any order
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The title element is not considered part of the flow of text.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
-
-
-
-
-
-
-
-
-
-
-
- document base URI
-
-
-
-
-
-
-
-
-
-
-
-
- generic metainformation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Relationship values can be used in principle:
-
- a) for document specific toolbars/menus when used
- with the link element in document head e.g.
- start, contents, previous, next, index, end, help
- b) to link to a separate style sheet (rel="stylesheet")
- c) to make a link to a script (rel="script")
- d) by stylesheets to control how collections of
- html nodes are rendered into printed documents
- e) to make a link to a printable version of this document
- e.g. a PostScript or PDF version (rel="alternate" media="print")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- style info, which may include CDATA sections
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- script statements, which may include CDATA sections
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- alternate content container for non script-based rendering
-
-
-
-
-
-
-
-
-
-
-
-
-
- ======================= Frames =======================================
-
-
-
-
-
-
- inline subwindow
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- alternate content container for non frame-based rendering
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Document Body ====================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generic language/style container
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Paragraphs =======================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Headings =========================================
-
- There are six levels of headings from h1 (the most important)
- to h6 (the least important).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Lists ============================================
-
-
-
-
-
-
- Unordered list bullet styles
-
-
-
-
-
-
-
-
-
-
-
-
- Unordered list
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Ordered list numbering style
-
- 1 arabic numbers 1, 2, 3, ...
- a lower alpha a, b, c, ...
- A upper alpha A, B, C, ...
- i lower roman i, ii, iii, ...
- I upper roman I, II, III, ...
-
- The style is applied to the sequence number which by default
- is reset to 1 for the first list item in an ordered list.
-
-
-
-
-
-
-
-
- Ordered (numbered) list
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- single column list (DEPRECATED)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- multiple column list (DEPRECATED)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LIStyle is constrained to: "(ULStyle|OLStyle)"
-
-
-
-
-
-
-
-
- list item
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- definition lists - dt for term, dd for its definition
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Address ==========================================
-
-
-
-
-
-
- information on author
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Horizontal Rule ==================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Preformatted Text ================================
-
-
-
-
-
-
- content is "Inline" excluding
- "img|object|applet|big|small|sub|sup|font|basefont"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Block-like Quotes ================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Text alignment ===================================
-
-
-
-
-
-
- center content
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Inserted/Deleted Text ============================
-
- ins/del are allowed in block and inline content, but its
- inappropriate to include block content within an ins element
- occurring in inline content.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================== The Anchor Element ================================
-
-
-
-
-
-
- content is "Inline" except that anchors shouldn't be nested
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ===================== Inline Elements ================================
-
-
-
-
-
-
- generic language/style container
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- I18N BiDi over-ride
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- forced line break
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- emphasis
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- strong emphasis
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- definitional
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- program code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- sample
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- something user would type
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- variable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- citation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- abbreviation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- acronym
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- inlined quote
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- subscript
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- superscript
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- fixed pitch font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- italic font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bold font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bigger font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- smaller font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- underline
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- strike-through
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- strike-through
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- base font size
-
-
-
-
-
-
-
-
-
-
-
-
-
- local change to font
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ==================== Object ======================================
-
- object is used to embed objects as part of HTML pages.
- param elements should precede other content. Parameters
- can also be expressed as attribute/value pairs on the
- object element itself when brevity is desired.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- param is used to supply a named property value.
- In XML it would seem natural to follow RDF and support an
- abbreviated syntax where the param elements are replaced
- by attribute value pairs on the object start tag.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Java applet ==================================
-
- One of code or object attributes must be present.
- Place param elements before other content.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================== Images ===========================================
-
- To avoid accessibility problems for people who aren't
- able to see the image, you should provide a text
- description using the alt and longdesc attributes.
- In addition, avoid the use of server-side image maps.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- usemap points to a map element which may be in this document
- or an external document, although the latter is not widely supported
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================== Client-side image maps ============================
-
- These can be placed in the same document or grouped in a
- separate document although this isn't yet widely supported
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================ Forms ===============================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Each label must not contain more than ONE field
- Label elements shouldn't be nested.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- form control
-
-
-
-
-
-
-
-
-
- the name attribute is required for all but submit & reset
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- option selector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- option group
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- selectable choice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- multi-line text field
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The fieldset element is used to group form fields.
- Only one legend element should occur in the content
- and if present should only be preceded by whitespace.
-
- NOTE: this content model is different from the XHTML 1.0 DTD,
- closer to the intended content model in HTML4 DTD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- fieldset label
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Content is "Flow" excluding a, form and form controls
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- single-line text input control (DEPRECATED)
-
-
-
-
-
-
-
-
-
-
-
- ======================= Tables =======================================
-
- Derived from IETF HTML table standard, see [RFC1942]
-
-
-
-
-
-
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
- "none" if border is absent or border="0" otherwise "all"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- horizontal placement of table relative to document
-
-
-
-
-
-
-
-
-
-
-
-
- horizontal alignment attributes for cell contents
-
- char alignment char, e.g. char=':'
- charoff offset for alignment char
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- vertical alignment attributes for cell contents
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use thead to duplicate headers when breaking table
- across page boundaries, or for static headers when
- tbody sections are rendered in scrolling panel.
-
- Use tfoot to duplicate footers when breaking table
- across page boundaries, or for static footers when
- tbody sections are rendered in scrolling panel.
-
- Use multiple tbody sections when rules are needed
- between groups of table rows.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- colgroup groups a set of col elements. It allows you to group
- several semantically related columns together.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
- width=64 width in screen pixels
- width=0.5* relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Scope is simpler than headers attribute for common tables
-
-
-
-
-
-
-
-
-
-
-
-
- th is for headers, td for data and for cells acting as both
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/IISExpress/config/templates/PersonalWebServer/applicationhost.config b/IISExpress/config/templates/PersonalWebServer/applicationhost.config
new file mode 100644
index 000000000..a424a2325
--- /dev/null
+++ b/IISExpress/config/templates/PersonalWebServer/applicationhost.config
@@ -0,0 +1,953 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IISExpress/config/templates/PersonalWebServer/aspnet.config b/IISExpress/config/templates/PersonalWebServer/aspnet.config
new file mode 100644
index 000000000..5a7f3fc52
--- /dev/null
+++ b/IISExpress/config/templates/PersonalWebServer/aspnet.config
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IISExpress/config/templates/PersonalWebServer/redirection.config b/IISExpress/config/templates/PersonalWebServer/redirection.config
new file mode 100644
index 000000000..a32637bb3
--- /dev/null
+++ b/IISExpress/config/templates/PersonalWebServer/redirection.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/IISExpress/custerr.dll b/IISExpress/custerr.dll
index 0e638083b..d093f059f 100644
Binary files a/IISExpress/custerr.dll and b/IISExpress/custerr.dll differ
diff --git a/IISExpress/defdoc.dll b/IISExpress/defdoc.dll
index 352e95f11..c2bbfa8be 100644
Binary files a/IISExpress/defdoc.dll and b/IISExpress/defdoc.dll differ
diff --git a/IISExpress/detoured.dll b/IISExpress/detoured.dll
index bfb5db85b..513cfccb2 100644
Binary files a/IISExpress/detoured.dll and b/IISExpress/detoured.dll differ
diff --git a/IISExpress/dirlist.dll b/IISExpress/dirlist.dll
index fd91ac7ad..74bbd265c 100644
Binary files a/IISExpress/dirlist.dll and b/IISExpress/dirlist.dll differ
diff --git a/IISExpress/en-us/iisres.dll.mui b/IISExpress/en-us/iisres.dll.mui
new file mode 100644
index 000000000..24b9914ff
Binary files /dev/null and b/IISExpress/en-us/iisres.dll.mui differ
diff --git a/IISExpress/filter.dll b/IISExpress/filter.dll
index cfb330892..b86d8f871 100644
Binary files a/IISExpress/filter.dll and b/IISExpress/filter.dll differ
diff --git a/IISExpress/gzip.dll b/IISExpress/gzip.dll
index 4d8bb69ec..2b8da3db4 100644
Binary files a/IISExpress/gzip.dll and b/IISExpress/gzip.dll differ
diff --git a/IISExpress/helperprocess.dll b/IISExpress/helperprocess.dll
deleted file mode 100644
index 9a347f9fe..000000000
Binary files a/IISExpress/helperprocess.dll and /dev/null differ
diff --git a/IISExpress/helperprocess.dll.clrhost.config b/IISExpress/helperprocess.dll.clrhost.config
deleted file mode 100644
index f8aa76ef9..000000000
--- a/IISExpress/helperprocess.dll.clrhost.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/IISExpress/helperprocess.dll.clrhost.config.template b/IISExpress/helperprocess.dll.clrhost.config.template
deleted file mode 100644
index 264776aec..000000000
--- a/IISExpress/helperprocess.dll.clrhost.config.template
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/IISExpress/hwebcore.dll b/IISExpress/hwebcore.dll
index 04e0d6bc8..bc5a110db 100644
Binary files a/IISExpress/hwebcore.dll and b/IISExpress/hwebcore.dll differ
diff --git a/IISExpress/iisRtl.dll b/IISExpress/iisRtl.dll
index f57c2d538..b95802ba1 100644
Binary files a/IISExpress/iisRtl.dll and b/IISExpress/iisRtl.dll differ
diff --git a/IISExpress/iis_ssi.dll b/IISExpress/iis_ssi.dll
index 8d12f289f..c0cd4aa97 100644
Binary files a/IISExpress/iis_ssi.dll and b/IISExpress/iis_ssi.dll differ
diff --git a/IISExpress/iiscore.dll b/IISExpress/iiscore.dll
index b69c38a4a..471780cda 100644
Binary files a/IISExpress/iiscore.dll and b/IISExpress/iiscore.dll differ
diff --git a/IISExpress/iisexpress.exe b/IISExpress/iisexpress.exe
index aa0515147..f8f44fbe2 100644
Binary files a/IISExpress/iisexpress.exe and b/IISExpress/iisexpress.exe differ
diff --git a/IISExpress/iisexpress.exe.manifest b/IISExpress/iisexpress.exe.manifest
index 5b6c5c763..20778a00a 100644
--- a/IISExpress/iisexpress.exe.manifest
+++ b/IISExpress/iisexpress.exe.manifest
@@ -17,7 +17,7 @@
-
+
diff --git a/IISExpress/iisexpresshelper.dll b/IISExpress/iisexpresshelper.dll
index a2981f0bc..2d61e4ae1 100644
Binary files a/IISExpress/iisexpresshelper.dll and b/IISExpress/iisexpresshelper.dll differ
diff --git a/IISExpress/iisexpresstray.exe.config b/IISExpress/iisexpresstray.exe.config
deleted file mode 100644
index 3f608d679..000000000
--- a/IISExpress/iisexpresstray.exe.config
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/IISExpress/iisfcgi.dll b/IISExpress/iisfcgi.dll
index 02167433b..7d7e6741b 100644
Binary files a/IISExpress/iisfcgi.dll and b/IISExpress/iisfcgi.dll differ
diff --git a/IISExpress/iisfreb.dll b/IISExpress/iisfreb.dll
index eb0a7495d..8cba256dd 100644
Binary files a/IISExpress/iisfreb.dll and b/IISExpress/iisfreb.dll differ
diff --git a/IISExpress/iisreqs.dll b/IISExpress/iisreqs.dll
index f8f76dd4a..51a96d4aa 100644
Binary files a/IISExpress/iisreqs.dll and b/IISExpress/iisreqs.dll differ
diff --git a/IISExpress/iisres.dll b/IISExpress/iisres.dll
index 802b68790..bd73b83d4 100644
Binary files a/IISExpress/iisres.dll and b/IISExpress/iisres.dll differ
diff --git a/IISExpress/iisutil2.dll b/IISExpress/iisutil2.dll
index 36ad364a9..bc0c1c553 100644
Binary files a/IISExpress/iisutil2.dll and b/IISExpress/iisutil2.dll differ
diff --git a/IISExpress/iisvermg.dll b/IISExpress/iisvermg.dll
index 53839b092..62e2155f8 100644
Binary files a/IISExpress/iisvermg.dll and b/IISExpress/iisvermg.dll differ
diff --git a/IISExpress/iprestr.dll b/IISExpress/iprestr.dll
index 770e2b536..3de654d78 100644
Binary files a/IISExpress/iprestr.dll and b/IISExpress/iprestr.dll differ
diff --git a/IISExpress/isapi.dll b/IISExpress/isapi.dll
index 22d09a7d9..c9dd5f7a0 100644
Binary files a/IISExpress/isapi.dll and b/IISExpress/isapi.dll differ
diff --git a/IISExpress/license.rtf b/IISExpress/license.rtf
index c24ecd8a7..366db337e 100644
Binary files a/IISExpress/license.rtf and b/IISExpress/license.rtf differ
diff --git a/IISExpress/logcust.dll b/IISExpress/logcust.dll
index e1ad32af3..a746022ae 100644
Binary files a/IISExpress/logcust.dll and b/IISExpress/logcust.dll differ
diff --git a/IISExpress/loghttp.dll b/IISExpress/loghttp.dll
index 680835347..65717794c 100644
Binary files a/IISExpress/loghttp.dll and b/IISExpress/loghttp.dll differ
diff --git a/IISExpress/modrqflt.dll b/IISExpress/modrqflt.dll
index 47e3debfa..e673f846e 100644
Binary files a/IISExpress/modrqflt.dll and b/IISExpress/modrqflt.dll differ
diff --git a/IISExpress/nativrd2.dll b/IISExpress/nativrd2.dll
index 386ee8c97..caf5f68ab 100644
Binary files a/IISExpress/nativrd2.dll and b/IISExpress/nativrd2.dll differ
diff --git a/IISExpress/protsup.dll b/IISExpress/protsup.dll
index 581bedc36..363cbcd15 100644
Binary files a/IISExpress/protsup.dll and b/IISExpress/protsup.dll differ
diff --git a/IISExpress/redirect.dll b/IISExpress/redirect.dll
index 58d4dcec2..ab4345110 100644
Binary files a/IISExpress/redirect.dll and b/IISExpress/redirect.dll differ
diff --git a/IISExpress/rewrite.dll b/IISExpress/rewrite.dll
index af2581b36..4d1b2811f 100644
Binary files a/IISExpress/rewrite.dll and b/IISExpress/rewrite.dll differ
diff --git a/IISExpress/rsca2.dll b/IISExpress/rsca2.dll
index 876fb8f08..ad5ce8dd0 100644
Binary files a/IISExpress/rsca2.dll and b/IISExpress/rsca2.dll differ
diff --git a/IISExpress/rscaext.dll b/IISExpress/rscaext.dll
index ba3bfd2f1..2053597ac 100644
Binary files a/IISExpress/rscaext.dll and b/IISExpress/rscaext.dll differ
diff --git a/IISExpress/rtinfo.dll b/IISExpress/rtinfo.dll
index f831a7b9f..d6749de72 100644
Binary files a/IISExpress/rtinfo.dll and b/IISExpress/rtinfo.dll differ
diff --git a/IISExpress/static.dll b/IISExpress/static.dll
index 3611881af..6691ccc5d 100644
Binary files a/IISExpress/static.dll and b/IISExpress/static.dll differ
diff --git a/IISExpress/urlauthz.dll b/IISExpress/urlauthz.dll
index 0a649eb50..d6f8871ea 100644
Binary files a/IISExpress/urlauthz.dll and b/IISExpress/urlauthz.dll differ
diff --git a/IISExpress/validcfg.dll b/IISExpress/validcfg.dll
index 19c54cefd..862e6fb56 100644
Binary files a/IISExpress/validcfg.dll and b/IISExpress/validcfg.dll differ
diff --git a/IISExpress/w3dt.dll b/IISExpress/w3dt.dll
index 1faa48177..317ee3bed 100644
Binary files a/IISExpress/w3dt.dll and b/IISExpress/w3dt.dll differ
diff --git a/IISExpress/w3tp.dll b/IISExpress/w3tp.dll
index 438a18b88..5a490a2c9 100644
Binary files a/IISExpress/w3tp.dll and b/IISExpress/w3tp.dll differ
diff --git a/IISExpress/w3wphost.dll b/IISExpress/w3wphost.dll
index e2cdfad00..c8481feb6 100644
Binary files a/IISExpress/w3wphost.dll and b/IISExpress/w3wphost.dll differ
diff --git a/IISExpress/wbhst_pm.dll b/IISExpress/wbhst_pm.dll
index f196656f7..6f46a7d0b 100644
Binary files a/IISExpress/wbhst_pm.dll and b/IISExpress/wbhst_pm.dll differ
diff --git a/IISExpress/webdav.dll b/IISExpress/webdav.dll
index 0dd745df4..5f0fc0ff3 100644
Binary files a/IISExpress/webdav.dll and b/IISExpress/webdav.dll differ
diff --git a/IISExpress/webdav_simple_lock.dll b/IISExpress/webdav_simple_lock.dll
index cbff8eb4b..852726b8b 100644
Binary files a/IISExpress/webdav_simple_lock.dll and b/IISExpress/webdav_simple_lock.dll differ
diff --git a/IISExpress/webdav_simple_prop.dll b/IISExpress/webdav_simple_prop.dll
index 5a1c735f7..e93f154b0 100644
Binary files a/IISExpress/webdav_simple_prop.dll and b/IISExpress/webdav_simple_prop.dll differ
diff --git a/IISExpress/webmatrixsup.dll b/IISExpress/webmatrixsup.dll
index 416d2cfb7..b6061cb4d 100644
Binary files a/IISExpress/webmatrixsup.dll and b/IISExpress/webmatrixsup.dll differ
diff --git a/NzbDrone.Web/log.config b/NzbDrone.Web/log.config
index 1267e3001..d5f9d9205 100644
--- a/NzbDrone.Web/log.config
+++ b/NzbDrone.Web/log.config
@@ -1,7 +1,6 @@
-
-
+
@@ -25,6 +24,5 @@
-
\ No newline at end of file
diff --git a/NzbDrone/IISController.cs b/NzbDrone/IISController.cs
index ee94d89b3..7b23f4c98 100644
--- a/NzbDrone/IISController.cs
+++ b/NzbDrone/IISController.cs
@@ -16,6 +16,8 @@ internal class IISController
private static readonly Logger Logger = LogManager.GetLogger("IISController");
private static readonly string IISFolder = Path.Combine(Config.ProjectRoot, @"IISExpress\");
private static readonly string IISExe = Path.Combine(IISFolder, @"iisexpress.exe");
+ private static readonly string IISConfigPath = Path.Combine(IISFolder, "AppServer", "applicationhost.config");
+
private static Timer _pingTimer;
private static int _pingFailCounter;
@@ -33,7 +35,7 @@ internal static Process StartServer()
IISProcess = new Process();
IISProcess.StartInfo.FileName = IISExe;
- IISProcess.StartInfo.Arguments = "/config:IISExpress\\Appserver\\applicationhost.config /trace:i";
+ IISProcess.StartInfo.Arguments = String.Format("/config:{0} /trace:i", IISConfigPath);//"/config:"""" /trace:i";
IISProcess.StartInfo.WorkingDirectory = Config.ProjectRoot;
IISProcess.StartInfo.UseShellExecute = false;
@@ -105,13 +107,16 @@ private static void Server(object sender, ElapsedEventArgs e)
try
{
new WebClient().DownloadString(AppUrl);
- Logger.Info("Server said hai...");
+ if (_pingFailCounter > 0)
+ {
+ Logger.Info("Application pool has been successfully recovered.");
+ }
_pingFailCounter = 0;
}
catch (Exception ex)
{
_pingFailCounter++;
- Logger.ErrorException("App is not responding. Count " + _pingFailCounter, ex);
+ Logger.ErrorException("Application pool is not responding. Count " + _pingFailCounter, ex);
if (_pingFailCounter > 2)
{
RestartServer();
@@ -121,7 +126,7 @@ private static void Server(object sender, ElapsedEventArgs e)
private static void OnDataReceived(object s, DataReceivedEventArgs e)
{
- if (e == null || e.Data == null || e.Data.StartsWith("Request started:") ||
+ if (e == null || String.IsNullOrWhiteSpace(e.Data) || e.Data.StartsWith("Request started:") ||
e.Data.StartsWith("Request ended:") || e.Data == ("IncrementMessages called"))
return;
diff --git a/NzbDrone/Program.cs b/NzbDrone/Program.cs
index a737f7cdf..310b0846e 100644
--- a/NzbDrone/Program.cs
+++ b/NzbDrone/Program.cs
@@ -38,18 +38,15 @@ private static void Main()
Process.Start(IISController.AppUrl);
- IISController.IISProcess.WaitForExit();
-
+ while (true)
+ {
+ Console.ReadLine();
+ }
}
catch (Exception e)
{
AppDomainException(e);
}
-
- while (true)
- {
- Console.ReadLine();
- }
}
private static void Attach()