Merge remote-tracking branch 'origin' into 252-test

bouncer.go

@@ -532,7 +532,7 @@ func handleNoStreamCache(bouncer *Bouncer, remoteIP string) (string, error) {
 	default:
 		bouncer.log.Debug("handleStreamCache:unknownType " + decision.Type)
 	}
-	if isLiveMode {
+	if isLiveMode && bouncer.defaultDecisionTimeout > 0 {
 		durationSecond := int64(duration.Seconds())
 		if bouncer.defaultDecisionTimeout < durationSecond {
 			durationSecond = bouncer.defaultDecisionTimeout

examples/custom-captcha/README.md

@@ -5,7 +5,7 @@ Read the example captcha before this, to better understand what is done here.
 ### Traefik configuration
 
 The minimal configuration is defined below to implement custom captcha.  
-This documentation use https://github.com/a-ve/wicketpeeker, a self-hosted captcha provider that have a similar API than big providers.
+This documentation use https://github.com/a-ve/wicketkeeper, a self-hosted captcha provider that have a similar API than big providers.
 
 Minimal API requirement:
 

examples/custom-captcha/docker-compose.yml

@@ -94,10 +94,10 @@ services:
     labels:
       - "traefik.enable=true"
       # Definition of the router
-      - "traefik.http.routers.router-wicketpeeker.rule=Host(`captcha.localhost`)"
-      - "traefik.http.routers.router-wicketpeeker.entrypoints=web"
+      - "traefik.http.routers.router-wicketkeeper.rule=Host(`captcha.localhost`)"
+      - "traefik.http.routers.router-wicketkeeper.entrypoints=web"
       # Definition of the service
-      - "traefik.http.services.service-whitekeeper.loadbalancer.server.port=8080"
+      - "traefik.http.services.service-wicketkeeper.loadbalancer.server.port=8080"
     depends_on:
       - redis