Skip to content

Commit c85d399

Browse files
committed
fix: version number
1 parent 7eca5bb commit c85d399

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/test-ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build:
1313
strategy:
1414
matrix:
15-
arch: [x86, x64]
15+
arch: [x64, x86]
1616
config: [Release, RelWithDebInfo]
1717
runs-on: windows-latest
1818

iis/installer.wxs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
lightArgs:
88
-->
99
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
10-
<Product Id="22B04FDB-9BAB-46B0-87B8-A39544ECECD3" Name="ModSecurity IIS" Language="1033" Version="2.9.12" Manufacturer="ModSecurity" UpgradeCode="82F09489-1678-4C38-ADCB-08C3757653DB">
10+
<Product Id="22B04FDB-9BAB-46B0-87B8-A39544ECECD3" Name="ModSecurity IIS" Language="1033" Version="2.9.13" Manufacturer="ModSecurity" UpgradeCode="82F09489-1678-4C38-ADCB-08C3757653DB">
1111
<Package Description="ModSecurityISS" Comments="none" InstallerVersion="405" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" />
1212
<?define ProductName = "ModSecurity IIS" ?>
1313
<?if $(sys.BUILDARCH) = x64 ?>
@@ -25,11 +25,11 @@
2525
<RegistrySearch Id="ConfigureIISRegistrySearch" Type="raw" Root="HKLM" Key="SOFTWARE\ModSecurity\ModSecurity" Name="ModSecurityConfigureIIS" Win64="no" />
2626
</Property>
2727
<?endif?>
28-
<!-- 检测 IIS 的主要版本 -->
28+
<!-- Detect the major version of IIS -->
2929
<Property Id="IIS">
3030
<RegistrySearch Id="IISInstalledVersion" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp" Type="raw" Name="MajorVersion" />
3131
</Property>
32-
<!-- 检测 ModSecurity IIS 模块及其依赖 DLL 文件是否存在 -->
32+
<!-- Detect if ModSecurity IIS module and its dependent DLL files exist -->
3333
<Property Id="FILEEXISTS" Secure="yes">
3434
<DirectorySearch Id="CheckFileDir1" Path="C:\Windows\System32\inetsrv" Depth="0">
3535
<FileSearch Id="CheckFile1" Name="ModSecurityIIS.dll" />
@@ -89,28 +89,28 @@
8989
<FileSearch Id="CheckFile19" Name="fuzzy.dll" />
9090
</DirectorySearch>
9191
</Property>
92-
<!-- 检测 IIS 的 WWW 根目录 -->
92+
<!-- Detect the WWW root directory of IIS -->
9393
<Property Id="WWWROOT">
9494
<RegistrySearch Id="FindInetPubFolder" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp" Name="PathWWWRoot" Type="directory" />
9595
</Property>
96-
<!-- 定义 MSI 属性,启用 MSI 的真实管理员检测,在“程序和功能”中禁用修复、修改选项 -->
96+
<!-- Define MSI properties, enable real administrator detection for MSI, and disable repair and modify options in "Programs and Features" -->
9797
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
98-
<!-- 定义安装条件 -->
98+
<!-- Define installation conditions -->
9999
<Condition Message="This setup requires IIS 7.0, 8.0 or 10.0. If that's the case, please ensure that the installer is running as administrator or try running it from the 'Apps and features' or 'Add/Remove Programs' menu"><![CDATA[(IIS="#7") OR (IIS="#8") OR (IIS="#10")]]></Condition>
100100
<!-- Version 2.7.5 had an uninstall issue that leaves some files behind. Asking the user to manually hash this out. -->
101101
<Condition Message="A older version of ModSecurityIIS was found in your computer. Please complete uninstall by removing the following file: [FILEEXISTS]. You may have to remove ModSecurity module from IIS, use the IIS Manager to do so."><![CDATA[(NOT FILEEXISTS) OR (Installed)]]></Condition>
102102
<Condition Message="64-bit operating system was detected, please use the 64-bit installer.">
103-
<!-- - 通过条件编译定义了 64/32位 ModSecurity IIS 模块及其依赖 DLL 文件组件及 IIS 配置 Schema 目录。 -->
103+
<!-- - Defines 64/32-bit ModSecurity IIS module and its dependent DLL file components and IIS configuration Schema directory through conditional compilation. -->
104104
<?if $(var.Win64) = "yes" ?>
105105
VersionNT64
106106
<?else?>
107107
NOT VersionNT64
108108
<?endif?></Condition>
109109
<Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />
110110
<Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
111-
<!-- 定义安装包的媒体信息 -->
111+
<!-- Define media information for the installation package -->
112112
<Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
113-
<!-- 定义安装包的目录结构 -->
113+
<!-- Define the directory structure of the installation package -->
114114
<Directory Id="TARGETDIR" Name="SourceDir">
115115
<?if $(var.Win64) = "yes" ?>
116116
<Directory Id="SystemFolder" Name="SystemFolder">
@@ -152,7 +152,7 @@
152152
</Directory>
153153
</Directory>
154154
</Directory>
155-
<!-- 12. 安装文件和 IIS 配置 -->
155+
<!-- 12. Installation files and IIS configuration -->
156156
<DirectoryRef Id="INSTALLFOLDER">
157157
<Component Id="ModSecCommon" DiskId="1" Guid="980270DF-81AB-469B-AB0E-64FA3BA160B6" Location="local">
158158
<File Id="README.TXT" Name="README.TXT" Source="wix\README.TXT" />
@@ -194,7 +194,7 @@
194194
<File Id="_64_ConfigSchema" Name="ModSecurity.xml" Source="ModSecurity.xml" />
195195
</Component>
196196
</DirectoryRef>
197-
<!-- 14. 功能组件 (Features) 定义了默认安装功能,包含 ModSecurity 的通用文件和配置 Schema -->
197+
<!-- 14. Features define default installation features, including common ModSecurity files and configuration Schema. -->
198198
<Feature Id="DefaultFeature" Title="ModSecurity IIS Common files" Level="1" InstallDefault="local" Absent="disallow" Display="expand" AllowAdvertise="no" Description="Configuration
199199
and common files">
200200
<ComponentRef Id="ModSecCommon" />

iis/mymodule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,4 +1321,4 @@ BOOL CMyHttpModule::WriteEventViewerLog(LPCSTR szNotification, WORD category)
13211321
NULL, 1, 0, &szNotification, NULL );
13221322
}
13231323
return FALSE;
1324-
}
1324+
}

0 commit comments

Comments
 (0)