diff options
author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-07-14 08:01:49 +0200 |
---|---|---|
committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-07-14 08:01:49 +0200 |
commit | 1c30503d5c1eee29eda7eea43b8ecb55c611da2d (patch) | |
tree | 062a9082a8dce886d4fe9129f12a7c24cc6f416d /sonar-plugin-api/src | |
parent | daecd67d182a23e4e2696a241a580f5bfbcf740c (diff) | |
parent | 6d28b0a28573c954ab8d253e66d0fcca15b5b30b (diff) | |
download | sonarqube-1c30503d5c1eee29eda7eea43b8ecb55c611da2d.tar.gz sonarqube-1c30503d5c1eee29eda7eea43b8ecb55c611da2d.zip |
Automatic merge from branch-5.6
* origin/branch-5.6:
SONAR-7866 Deprecate Server#isSecured()
SONAR-7560 Fix WS description
Diffstat (limited to 'sonar-plugin-api/src')
-rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java index bfa8d8b6749..8d52dce62d5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java @@ -66,7 +66,9 @@ public abstract class Server { * Return whether or not the {#getPublicRootUrl} is started with https. * * @since 5.4 + * @deprecated since 5.6, use instead {@link javax.servlet.http.HttpServletRequest#getHeader(String)} and check that X-Forwarded-Proto header is set to "https". */ + @Deprecated public abstract boolean isSecured(); /** |