Skip to content

fix(iis): strip IPv6 zone/scope id from client IP string #3631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A13501350 wants to merge 1 commit into
base: v2/master
Choose a base branch
from
+9 −1
Open

fix(iis): strip IPv6 zone/scope id from client IP string #3631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion iis/mymodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// IIS7 Server API header file
#include <Windows.h>
#include <sal.h>
#include <string.h>
#include <strsafe.h>
#include "httpserv.h"

Expand Down Expand Up @@ -104,7 +105,14 @@ char *GetIpAddr(apr_pool_t *pool, PSOCKADDR pAddr)
if (GetNameInfo(pAddr, addrSize, buf, NI_MAXHOST, nullptr, 0, NI_NUMERICHOST) != 0) {
return apr_pstrdup(pool, "");
}


if (pAddr->sa_family == AF_INET6) {
char *zone = strchr(buf, '%');
if (zone != nullptr) {
*zone = '\0';
}
}

return buf;
}

Expand Down
Loading