Merge branch 'main' into pythongermany

PythonGermany · PythonGermany · commit 114bbfb97bc0 · 2023-10-22T19:33:07.000+02:00
diff --git a/src/http/VirtualHost.cpp b/src/http/VirtualHost.cpp
@@ -76,7 +76,8 @@ VirtualHost *VirtualHost::matchVirtualHost(Address &address, std::string host) {
           (*it)->getContext().getDirective("server_name")[0];
       for (std::vector<std::string>::const_iterator itSn = serverNames.begin();
            itSn != serverNames.end(); ++itSn) {
-        if (*itSn == host) return *it;
+        int diff = std::strcmp(itSn->c_str(), host.c_str());
+        if (!diff || diff == ':' || -diff == ':') return *it;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ VirtualHost *VirtualHost::matchVirtualHost(Address &address, std::string host) {`
`76`	`76`	`(*it)->getContext().getDirective("server_name")[0];`
`77`	`77`	`for (std::vector<std::string>::const_iterator itSn = serverNames.begin();`
`78`	`78`	`itSn != serverNames.end(); ++itSn) {`
`79`		`- if (itSn == host) return it;`
	`79`	`+ int diff = std::strcmp(itSn->c_str(), host.c_str());`
	`80`	`+ if (!diff \|\| diff == ':' \|\| -diff == ':') return *it;`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`}`