Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-17 09:57:01 +00:00
Code Releases Activity

resolve conflicts with current master v11.1.1

Browse Source 
Former-commit-id: 659ff392e889f3a8552d7da3d44848f1a364f7b2
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-07-23 19:20:07 +03:00
parent 79539b0055 85b1f6fc24
commit 736709aa75
41 changed files with 406 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/netutil/addr.go
View File

@@ -127,7 +127,7 @@ func ResolveAddr(addr string) string {
if a[portIdx:] == ":https" {
a = defaultServerHostname + ":443"
} else {
// if contains only :port ,then the : is the first letter, so we dont have setted a hostname, lets set it
// if contains only :port ,then the : is the first letter, so we dont have set a hostname, lets set it
a = defaultServerHostname + a
}
}