diff options
Diffstat (limited to 'src/ext/Iis/ca/scaexecIIS7.cpp')
| -rw-r--r-- | src/ext/Iis/ca/scaexecIIS7.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ext/Iis/ca/scaexecIIS7.cpp b/src/ext/Iis/ca/scaexecIIS7.cpp index 108007a1..52378d34 100644 --- a/src/ext/Iis/ca/scaexecIIS7.cpp +++ b/src/ext/Iis/ca/scaexecIIS7.cpp | |||
| @@ -566,7 +566,7 @@ HRESULT IIS7AspProperty( | |||
| 566 | // | 566 | // |
| 567 | //Do not append trailing '/' for default vDir | 567 | //Do not append trailing '/' for default vDir |
| 568 | // | 568 | // |
| 569 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzPathName, -1, L"/", -1)) | 569 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzPathName, -1, L"/", -1, TRUE)) |
| 570 | { | 570 | { |
| 571 | hr = StrAllocConcat(&pwzLocationPath, L"/", 0); | 571 | hr = StrAllocConcat(&pwzLocationPath, L"/", 0); |
| 572 | ExitOnFailure(hr, "failed to copy location WebDir '/'"); | 572 | ExitOnFailure(hr, "failed to copy location WebDir '/'"); |
| @@ -742,7 +742,7 @@ HRESULT IIS7WebDir( | |||
| 742 | // | 742 | // |
| 743 | //Do not append trailing '/' for default vDir | 743 | //Do not append trailing '/' for default vDir |
| 744 | // | 744 | // |
| 745 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzPathName, -1, L"/", -1)) | 745 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzPathName, -1, L"/", -1, TRUE)) |
| 746 | { | 746 | { |
| 747 | hr = StrAllocConcat(&pwzLocationPath, L"/", 0); | 747 | hr = StrAllocConcat(&pwzLocationPath, L"/", 0); |
| 748 | ExitOnFailure(hr, "failed to copy location WebDir '/'"); | 748 | ExitOnFailure(hr, "failed to copy location WebDir '/'"); |
| @@ -998,7 +998,7 @@ HRESULT IIS7WebError( | |||
| 998 | hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName); | 998 | hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName); |
| 999 | ExitOnFailure(hr, "failed to format web error config path"); | 999 | ExitOnFailure(hr, "failed to format web error config path"); |
| 1000 | 1000 | ||
| 1001 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzAppName, -1, L"/", -1)) | 1001 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzAppName, -1, L"/", -1, TRUE)) |
| 1002 | { | 1002 | { |
| 1003 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); | 1003 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); |
| 1004 | ExitOnFailure(hr, "failed to copy web error config path delim"); | 1004 | ExitOnFailure(hr, "failed to copy web error config path delim"); |
| @@ -1325,7 +1325,7 @@ HRESULT IIS7HttpHeader( | |||
| 1325 | hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName); | 1325 | hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName); |
| 1326 | ExitOnFailure(hr, "failed to format web error config path"); | 1326 | ExitOnFailure(hr, "failed to format web error config path"); |
| 1327 | 1327 | ||
| 1328 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzAppName, -1, L"/", -1)) | 1328 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzAppName, -1, L"/", -1, TRUE)) |
| 1329 | { | 1329 | { |
| 1330 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); | 1330 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); |
| 1331 | ExitOnFailure(hr, "failed to copy web error config path delim"); | 1331 | ExitOnFailure(hr, "failed to copy web error config path delim"); |
| @@ -2340,7 +2340,7 @@ HRESULT IIS7AppExtension( | |||
| 2340 | // | 2340 | // |
| 2341 | //Do not append trailing '/' for default vDir | 2341 | //Do not append trailing '/' for default vDir |
| 2342 | // | 2342 | // |
| 2343 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1)) | 2343 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE)) |
| 2344 | { | 2344 | { |
| 2345 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); | 2345 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); |
| 2346 | ExitOnFailure(hr, "failed to copy appext config path delim"); | 2346 | ExitOnFailure(hr, "failed to copy appext config path delim"); |
| @@ -2495,7 +2495,7 @@ LExit: | |||
| 2495 | // | 2495 | // |
| 2496 | //Do not append trailing '/' for default vDir | 2496 | //Do not append trailing '/' for default vDir |
| 2497 | // | 2497 | // |
| 2498 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1)) | 2498 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE)) |
| 2499 | { | 2499 | { |
| 2500 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); | 2500 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); |
| 2501 | ExitOnFailure(hr, "failed to copy appext config path delim"); | 2501 | ExitOnFailure(hr, "failed to copy appext config path delim"); |
| @@ -2627,7 +2627,7 @@ HRESULT IIS7DirProperties( | |||
| 2627 | // | 2627 | // |
| 2628 | //Do not append trailing '/' for default vDir | 2628 | //Do not append trailing '/' for default vDir |
| 2629 | // | 2629 | // |
| 2630 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1)) | 2630 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE)) |
| 2631 | { | 2631 | { |
| 2632 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); | 2632 | hr = StrAllocConcat(&pwzConfigPath, L"/", 0); |
| 2633 | ExitOnFailure(hr, "failed to copy appext config path delim"); | 2633 | ExitOnFailure(hr, "failed to copy appext config path delim"); |
| @@ -3337,7 +3337,7 @@ static HRESULT CreateWebLog( | |||
| 3337 | ExitOnFailure(hr, "Failed get logfile element"); | 3337 | ExitOnFailure(hr, "Failed get logfile element"); |
| 3338 | ReleaseVariant(vtProp); | 3338 | ReleaseVariant(vtProp); |
| 3339 | 3339 | ||
| 3340 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzFormat, -1, L"none", -1)) | 3340 | if (CSTR_EQUAL != ::CompareStringOrdinal(pwzFormat, -1, L"none", -1, TRUE)) |
| 3341 | { | 3341 | { |
| 3342 | hr = Iis7PutPropertyString(pLogFile, IIS_CONFIG_LOGFORMAT, pwzFormat); | 3342 | hr = Iis7PutPropertyString(pLogFile, IIS_CONFIG_LOGFORMAT, pwzFormat); |
| 3343 | ExitOnFailure(hr, "Failed set logfile format property"); | 3343 | ExitOnFailure(hr, "Failed set logfile format property"); |
| @@ -4118,7 +4118,7 @@ static HRESULT ClearLocationTag( | |||
| 4118 | ExitOnFailure(hr, "Failed to get IIS location collection count"); | 4118 | ExitOnFailure(hr, "Failed to get IIS location collection count"); |
| 4119 | 4119 | ||
| 4120 | hr = pLocation->get_Path(&bstrLocationPath); | 4120 | hr = pLocation->get_Path(&bstrLocationPath); |
| 4121 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, swLocationPath, -1, bstrLocationPath, -1)) | 4121 | if (CSTR_EQUAL == ::CompareStringOrdinal(swLocationPath, -1, bstrLocationPath, -1, TRUE)) |
| 4122 | { | 4122 | { |
| 4123 | hr = pLocationCollection->DeleteLocation(vtIndex); | 4123 | hr = pLocationCollection->DeleteLocation(vtIndex); |
| 4124 | ExitOnFailure(hr, "Failed to delete IIS location tag %ls",swLocationPath); | 4124 | ExitOnFailure(hr, "Failed to delete IIS location tag %ls",swLocationPath); |
