Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fix Quota rest rate limiter support
Change-Id: I802af8a12ac0128e04e75b5aa2e575a1d3f975d6
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/RestApiRateLimiter.java b/src/main/java/com/googlesource/gerrit/plugins/quota/RestApiRateLimiter.java
index ca59d8d..1a7fa98 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/quota/RestApiRateLimiter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/quota/RestApiRateLimiter.java
@@ -47,7 +47,7 @@
private final LoadingCache<Account.Id, Holder> limitsPerAccount;
private final LoadingCache<String, Holder> limitsPerRemoteHost;
- private final Pattern resturi =
+ private final Pattern servletPath =
Pattern.compile(
"^/(?:a/)?"
+ "(access|accounts|changes|config|groups|plugins|projects|Documentation|tools)/(.*)$");
@@ -110,6 +110,6 @@
boolean isRest(ServletRequest req) {
return req instanceof HttpServletRequest
- && resturi.matcher(((HttpServletRequest) req).getRequestURI()).matches();
+ && servletPath.matcher(((HttpServletRequest) req).getServletPath()).matches();
}
}
