UWVA#31069 Betere detectie IIS 7.5

svn path=/FcltISAPI/trunk/; revision=23459
This commit is contained in:
Jos Groot Lipman
2014-11-26 10:56:13 +00:00
parent f61365ce4e
commit 0c15e026d1
2 changed files with 8 additions and 9 deletions

View File

@@ -4,7 +4,7 @@
#include "tchar.h" #include "tchar.h"
#include "time.h" #include "time.h"
#define FCLT_ISAPI_VERSION "1.00" #define FCLT_ISAPI_VERSION "1.01"
// http://believeinmiraclesx.wordpress.com/2013/11/19/isapi-filter-set-httponly-for-mulitple-cookies/ // http://believeinmiraclesx.wordpress.com/2013/11/19/isapi-filter-set-httponly-for-mulitple-cookies/
// http://stackoverflow.com/questions/17649213/how-to-set-multiple-cookies-in-isapi-filter // http://stackoverflow.com/questions/17649213/how-to-set-multiple-cookies-in-isapi-filter
@@ -24,9 +24,9 @@ public:
DWORD cbCookie = sizeof(szCookie) / sizeof(szCookie[0]); DWORD cbCookie = sizeof(szCookie) / sizeof(szCookie[0]);
pFC->GetServerVariable(pFC, "SERVER_SOFTWARE", szCookie, &cbCookie); pFC->GetServerVariable(pFC, "SERVER_SOFTWARE", szCookie, &cbCookie);
iis_version = 6; iis_version = 7;
if (strstr(szCookie, "7.0")) if (strstr(szCookie, "IIS/6.0")) // 2008R2 is 7.5, 2012 is 8.0?
iis_version = 7; iis_version = 6;
} }
clock_t GetStartTime() clock_t GetStartTime()
@@ -47,7 +47,6 @@ public:
{ {
strcpy_s(userid, token); strcpy_s(userid, token);
} }
} }
private: private:

View File

@@ -58,8 +58,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,2 FILEVERSION 1,0,1,2
PRODUCTVERSION 1,0,0,2 PRODUCTVERSION 1,0,1,2
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -76,13 +76,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Facilitor B.V.\0" VALUE "CompanyName", "Facilitor B.V.\0"
VALUE "FileDescription", "fcltisapi Internet Server Filter\0" VALUE "FileDescription", "fcltisapi Internet Server Filter\0"
VALUE "FileVersion", "1, 0, 0, 2\0" VALUE "FileVersion", "1, 0, 1, 2\0"
VALUE "InternalName", "FCLTISAPI\0" VALUE "InternalName", "FCLTISAPI\0"
VALUE "LegalCopyright", "Copyright (C) 2013-2014 Facilitor B.V.\0" VALUE "LegalCopyright", "Copyright (C) 2013-2014 Facilitor B.V.\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "FCLTISAPI.DLL\0" VALUE "OriginalFilename", "FCLTISAPI.DLL\0"
VALUE "ProductName", "fcltisapi Internet Server Filter\0" VALUE "ProductName", "fcltisapi Internet Server Filter\0"
VALUE "ProductVersion", "1, 0, 0, 2\0" VALUE "ProductVersion", "1, 0, 1, 2\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"