Merge pull request #362 from Azure/master

Updating version to 0.2.14 with new features/fixes
tjanczuk · Jul 20, 2014 · 57401b0 · 57401b0
2 parents 02c2367 + 23fd204
commit 57401b0
Show file tree

Hide file tree

Showing 1,162 changed files with 201,392 additions and 5,663 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,11 @@
 Hosting node.js applications in IIS on Windows
 ===
 
+**Branches**
+
+- master: stable version.
+- iisnode-dev: development branch.
+
 **Why would I want to do it?**
 
 [Benefits](https://github.com/tjanczuk/iisnode/wiki)
@@ -36,22 +41,29 @@ Hosting node.js applications in IIS on Windows
 - Open WebMatrix, choose “Site from folder”, enter %localappdata%\iisnode\www, start the site, and play with the iisnode samples, or
 - Use node.js templates to get started quickly with an Express application or a skeleton Hello World
 
-**Howtos**
+**Installing for IIS Express 8 on Windows x64**
+This can be a head-scratcher since IIS Express 8 gives you both 32-bit and 64-bit versions (http://www.iis.net/learn/extensions/introduction-to-iis-express/iis-80-express-readme). You can either:
+- Install the full x64 version, then in Visual Studio go to Tools > Options > Projects and Solutions > Web Projects > Use the 64 bit version of IIS Express. This way you have a single install for both IIS and IIS Express.
+- Separately install iisnode express version (https://github.com/azure/iisnode/wiki/iisnode-releases).
 
-[the basics](http://tomasz.janczuk.org/2011/08/hosting-nodejs-applications-in-iis-on.html)
-[the basics (Pусский перевод)](http://softdroid.net/hosting-nodejs-applications-ru)
-[**NEW: websockets**] (http://tomasz.janczuk.org/2012/11/how-to-use-websockets-with-nodejs-apps.html)
-[using with express framework](http://tomasz.janczuk.org/2011/08/hosting-express-nodejs-applications-in.html)
-[using with URL rewrite module](http://tomasz.janczuk.org/2011/08/using-url-rewriting-with-nodejs.html)
-[using with WebMatrix and IIS Express](http://tomasz.janczuk.org/2011/08/developing-nodejs-applications-in.html)
-[site templates for WebMatrix](https://github.com/SteveSanderson/Node.js-Site-Templates-for-WebMatrix)
-[using with mongodb](http://www.amazedsaint.com/2011/09/creating-10-minute-todo-listing-app-on.html)
-[diagnosing problems with ETW traces](http://tomasz.janczuk.org/2011/09/using-event-tracing-for-windows-to.html)
-[using with MVC](http://weblogs.asp.net/jgalloway/archive/2011/10/26/using-node-js-in-an-asp-net-mvc-application-with-iisnode.aspx)
-[portuguese: node.js no windows: instalando o iisnode](http://vivina.com.br/nodejs-windows-parte-2)
-[integrated debugging](http://tomasz.janczuk.org/2011/11/debug-nodejs-applications-on-windows.html)
-[pub/sub server using faye](http://weblogs.asp.net/cibrax/archive/2011/12/12/transform-your-iis-into-a-real-time-pub-sub-engine-with-faye-node.aspx)
-[appharbor uses iisnode](http://blog.appharbor.com/2012/01/19/announcing-node-js-support)
+
+**Howtos**
+=======
+- [the basics](http://tomasz.janczuk.org/2011/08/hosting-nodejs-applications-in-iis-on.html)
+- [the basics (Pусский перевод)](http://softdroid.net/hosting-nodejs-applications-ru)
+- [**NEW: websockets**] (http://tomasz.janczuk.org/2012/11/how-to-use-websockets-with-nodejs-apps.html)
+- [using with express framework](http://tomasz.janczuk.org/2011/08/hosting-express-nodejs-applications-in.html)
+- [using with URL rewrite module](http://tomasz.janczuk.org/2011/08/using-url-rewriting-with-nodejs.html)
+- [using with WebMatrix and IIS Express](http://tomasz.janczuk.org/2011/08/developing-nodejs-applications-in.html)
+- [site templates for WebMatrix](https://github.com/SteveSanderson/Node.js-Site-Templates-for-WebMatrix)
+- [using with mongodb](http://www.amazedsaint.com/2011/09/creating-10-minute-todo-listing-app-on.html)
+- [diagnosing problems with ETW traces](http://tomasz.janczuk.org/2011/09/using-event-tracing-for-windows-to.html)
+- [using with MVC](http://weblogs.asp.net/jgalloway/archive/2011/10/26/using-node-js-in-an-asp-net-mvc-application-with-iisnode.aspx)
+- [portuguese: node.js no windows: instalando o iisnode](http://vivina.com.br/nodejs-windows-parte-2)
+- [integrated debugging](http://tomasz.janczuk.org/2011/11/debug-nodejs-applications-on-windows.html)
+- [**NEW: integrated debugging with node-inspector v0.7.3**](http://www.ranjithr.com/?p=98)
+- [pub/sub server using faye](http://weblogs.asp.net/cibrax/archive/2011/12/12/transform-your-iis-into-a-real-time-pub-sub-engine-with-faye-node.aspx)
+- [appharbor uses iisnode](http://blog.appharbor.com/2012/01/19/announcing-node-js-support)
 
 **Prerequisites for building**
 

diff --git a/src/config/iisnode_dev_x64.xml b/src/config/iisnode_dev_x64.xml
@@ -36,13 +36,14 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>
     <attribute name="namedPipeConnectionRetryDelay" type="uint" defaultValue="250"/>
     <attribute name="maxNamedPipeConnectionPoolSize" type="uint" defaultValue="512"/>
-    <attribute name="maxNamedPipePooledConnectionAge" type="uint" defaultValue="30000"/>    
+    <attribute name="maxNamedPipePooledConnectionAge" type="uint" defaultValue="30000"/>
     <attribute name="initialRequestBufferSize" type="uint" defaultValue="4096"/>
     <attribute name="maxRequestBufferSize" type="uint" defaultValue="65536"/>
     <attribute name="uncFileChangesPollingInterval" type="uint" defaultValue="5000"/>
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_dev_x86_on_x64.xml b/src/config/iisnode_dev_x86_on_x64.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_dev_x86_on_x86.xml b/src/config/iisnode_dev_x86_on_x86.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_express_schema.xml b/src/config/iisnode_express_schema.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_express_schema_x64.xml b/src/config/iisnode_express_schema_x64.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_schema.xml b/src/config/iisnode_schema.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>
diff --git a/src/config/iisnode_schema_x64.xml b/src/config/iisnode_schema_x64.xml
@@ -43,6 +43,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="gracefulShutdownTimeout" type="uint" defaultValue="60000"/>
     <attribute name="logDirectory" type="string" expanded="true" defaultValue="iisnode"/>
     <attribute name="debuggingEnabled" type="bool" defaultValue="true"/>
+    <attribute name="debuggerExtensionDll" type="string" defaultValue="iisnode-inspector-0.7.3.dll"/>
     <attribute name="debugHeaderEnabled" type="bool" defaultValue="false"/>
     <attribute name="debuggerVirtualDir" type="string" defaultValue="" />
     <attribute name="debuggerPathSegment" type="string" expanded="true" defaultValue="debug"/>
@@ -57,5 +58,6 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="enableXFF" type="bool" defaultValue="false"/>
     <attribute name="promoteServerVars" type="string" defaultValue=""/>
     <attribute name="configOverrides" type="string" expanded="true" defaultValue="iisnode.yml"/>
+    <attribute name="recycleSignalEnabled" type="bool" defaultValue="false"/>
   </sectionSchema>
 </configSchema>