Skip to content

Commit 19c7e46

Browse files
tjanczuktjanczuk
committed
fix #178. Enable x64 of node.js
1 parent 681cbc9 commit 19c7e46

12 files changed

+9
-70
lines changed

Diff for: ‎src/config/iisnode_dev_x64.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-dev\release\x64\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_dev_x86_on_x64.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-dev\release\x86\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_dev_x86_on_x86.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode-dev\release\x86\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_express_schema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode-express\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_express_schema_x64.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-express\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_schema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_schema_x64.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/config/iisnode_schema_x64_wow.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
3030
<attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
3131
<attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
3232
<attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
33-
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\nodejs\node.exe&quot;"/>
33+
<attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
3434
<attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode\interceptor.js&quot;" />
3535
<attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
3636
<attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

Diff for: ‎src/iisnode/cprotocolbridge.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ BOOL CProtocolBridge::SendIisnodeError(IHttpContext* httpCtx, HRESULT hr)
164164
"The iisnode module is unable to start the node.exe process. Make sure the node.exe executable is available "
165165
"at the location specified in the <a href=""https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config"">"
166166
"system.webServer/iisnode/@nodeProcessCommandLine</a> element of web.config. "
167-
"By default node.exe is expected to be installed in %ProgramFiles%\\nodejs folder on x86 systems and "
168-
"%ProgramFiles(x86)%\\nodejs folder on x64 systems.";
167+
"By default node.exe is expected in one of the directories listed in the PATH environment variable.";
169168

170169
CProtocolBridge::SendSyncResponse(
171170
httpCtx,

Diff for: ‎src/setup/iisnode-express-msi/iisnode.wxs

-20
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@
2323

2424
<Property Id="ALLUSERS" Secure="yes"/>
2525

26-
<Property Id="NODEEXE32">
27-
<DirectorySearch Id="NodeDir32" Path="[ProgramFilesFolder]nodejs">
28-
<FileSearch Name="node.exe" />
29-
</DirectorySearch>
30-
</Property>
31-
32-
<Property Id="NODEEXE64">
33-
<DirectorySearch Id="NodeDir64" Path="[ProgramFiles64Folder]nodejs">
34-
<FileSearch Name="node.exe" />
35-
</DirectorySearch>
36-
</Property>
37-
3826
<Property Id="APPCMDEXE">
3927
<DirectorySearch Id="IISExpressDir" Path="[ProgramFilesFolder]IIS Express">
4028
<FileSearch Name="appcmd.exe" />
@@ -56,14 +44,6 @@
5644
<Condition Message="IIS Express 7.x or later must be installed before iisnode for IIS Express 7.x installation.">
5745
<![CDATA[Installed or APPCMDEXE]]>
5846
</Condition>
59-
60-
<Condition Message="Node.js x64 is not found in the [ProgramFiles64Folder]\nodejs folder. Please install node.js x64 and restart this installer.">
61-
<![CDATA[VersionNT64 and (Installed OR NODEEXE64)]]>
62-
</Condition>
63-
64-
<Condition Message="Node.js x86 is not found in the [ProgramFilesFolder]\nodejs folder. Please install node.js x86 and restart this installer.">
65-
<![CDATA[NOT(VersionNT64) and (Installed OR NODEEXE32)]]>
66-
</Condition>
6747

6848
<PropertyRef Id="WIX_DIR_COMMON_DOCUMENTS"/>
6949

Diff for: ‎src/setup/iisnode-msi/customactions.wxi

-16
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,5 @@
106106
Impersonate="no"/>
107107
<?endif?>
108108

109-
<?if $(var.isWin64) = "yes" ?>
110-
<CustomAction Id="AddPermissionsToNodeExeForDefaultIISUser"
111-
ExeCommand="[System64Folder]icacls.exe &quot;[NODEEXE64]&quot; /grant IIS_IUSRS:rx"
112-
Directory="TARGETDIR"
113-
Execute="deferred"
114-
Return="check"
115-
Impersonate="no"/>
116-
<?else?>
117-
<CustomAction Id="AddPermissionsToNodeExeForDefaultIISUser"
118-
ExeCommand="[SystemFolder]icacls.exe &quot;[NODEEXE32]&quot; /grant IIS_IUSRS:rx"
119-
Directory="TARGETDIR"
120-
Execute="deferred"
121-
Return="check"
122-
Impersonate="no"/>
123-
<?endif?>
124-
125109
</Fragment>
126110
</Include>

Diff for: ‎src/setup/iisnode-msi/iisnode.wxs

-24
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,6 @@
4848

4949
<Property Id="ALLUSERS" Value="1" />
5050

51-
<Property Id="NODEEXE32">
52-
<DirectorySearch Id="NodeDir32" Path="[ProgramFilesFolder]nodejs">
53-
<FileSearch Name="node.exe" />
54-
</DirectorySearch>
55-
</Property>
56-
57-
<Property Id="NODEEXE64">
58-
<DirectorySearch Id="NodeDir64" Path="[ProgramFiles64Folder]nodejs">
59-
<FileSearch Name="node.exe" />
60-
</DirectorySearch>
61-
</Property>
62-
6351
<Property Id="VCREDIST2012INSTALLED">
6452
<?if $(var.isWin64) = "yes"?>
6553
<RegistrySearch Id="VCRedist2012Search64" Root="HKLM" Key="Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{15134cb0-b767-4960-a911-f2d16ae54797}" Name="Installed" Type="raw" />
@@ -84,14 +72,6 @@
8472
<![CDATA[IISMAJORVERSION >= "#7"]]>
8573
</Condition>
8674

87-
<Condition Message="Node.js x64 is not found in the [ProgramFiles64Folder]\nodejs folder. Please install node.js x64 and restart this installer.">
88-
<![CDATA[Installed OR NOT(VersionNT64) OR NODEEXE64 OR WOW]]>
89-
</Condition>
90-
91-
<Condition Message="Node.js x86 is not found in the [ProgramFilesFolder]\nodejs folder. Please install node.js x86 and restart this installer.">
92-
<![CDATA[Installed OR (VersionNT64 and NOT(WOW)) OR NODEEXE32]]>
93-
</Condition>
94-
9575
<Directory Id="TARGETDIR" Name="SourceDir">
9676
<?if $(var.isWin64) = "yes" ?>
9777
<Directory Id="System64Folder" />
@@ -151,10 +131,6 @@
151131
<Custom Action="RollbackAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
152132
<Custom Action="UndoAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE="ALL"</Custom>
153133

154-
<!-- grant permissions for default IIS user to read and execute pre-installed node.exe -->
155-
156-
<Custom Action="AddPermissionsToNodeExeForDefaultIISUser" After="AddIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
157-
158134
</InstallExecuteSequence>
159135

160136
</Product>

0 commit comments

Comments
 (0)