Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 14:17:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix bad merge conflict, make tests pass

Browse source
This commit is contained in:
Matthew Holt 2018-02-16 23:20:08 -07:00
parent 269a8b5fce
commit a6521357e5
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddyhttp/basicauth/basicauth_test.go
View file

@ -171,7 +171,7 @@ md5:$apr1$l42y8rex$pOA2VJ0x/0TwaFeAF9nX61`
htfh, err := ioutil.TempFile("", "basicauth-")
if err != nil {
t.Skipf("Error creating temp file (%v), will skip htpassword test")
t.Skip("Error creating temp file, will skip htpassword test")
return
}
defer os.Remove(htfh.Name())

9
plugins.go
View file

@ -66,7 +66,7 @@ func DescribePlugins() string {
str += " " + name + "\n"
}
if len(eventHooks) > 0 {
if len(pl["event_hooks"]) > 0 {
str += "\nEvent hook plugins:\n"
for _, name := range pl["event_hooks"] {
str += " hook." + name + "\n"
@ -100,15 +100,10 @@ func ListPlugins() map[string][]string {
}
// List the event hook plugins
hooks := ""
eventHooks.Range(func(k, _ interface{}) bool {
hooks += " hook." + k.(string) + "\n"
p["event_hooks"] = append(p["event_hooks"], k.(string))
return true
})
if hooks != "" {
str += "\nEvent hook plugins:\n"
str += hooks
}
// alphabetize the rest of the plugins
var others []string