From 88f64b8abfc252bdc77b95bc5eed0c9dbaf78aae Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 9 Jan 2018 14:02:09 +0100 Subject: [PATCH] fixed compliance names in formats Signed-off-by: Greg Wilkins --- .../org/eclipse/jetty/http/HttpCompliance.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java index 56b0451c701..637c2641039 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java @@ -42,8 +42,8 @@ import org.eclipse.jetty.util.log.Logger; * * The remainder of the list can contain then names of {@link HttpComplianceSection}s to include them in the mode, or prefixed * with a '-' to exclude thm from the mode. Note that Jetty's modes may have some historic minor differences from the strict - * RFC compliance, for example the RFC2616 HttpCompliance is defined as - * RFC2616,-RFC7230_3_2_FIELD_COLON,-RFC7230_3_1_1_METHOD_CASE_SENSITIVE. + * RFC compliance, for example the RFC2616_LEGACY HttpCompliance is defined as + * RFC2616,-FIELD_COLON,-METHOD_CASE_SENSITIVE. *

* Note also that the {@link EnumSet} return by {@link HttpCompliance#sections()} is mutable, so that modes may * be altered in code and will affect all usages of the mode. @@ -51,20 +51,20 @@ import org.eclipse.jetty.util.log.Logger; public enum HttpCompliance // TODO in Jetty-10 convert this enum to a class so that extra custom modes can be defined dynamically { /** A Legacy compliance mode to match jetty's behavior prior to RFC2616 and RFC7230. It only - * contains {@link HttpComplianceSection#RFC7230_3_1_1_METHOD_CASE_SENSITIVE} + * contains {@link HttpComplianceSection#METHOD_CASE_SENSITIVE} */ - LEGACY(sectionsBySpec("0,RFC7230_3_1_1_METHOD_CASE_SENSITIVE")), + LEGACY(sectionsBySpec("0,METHOD_CASE_SENSITIVE")), /** The legacy RFC2616 support, which incorrectly excludes - * {@link HttpComplianceSection#RFC7230_3_2_4_NO_WS_AFTER_FIELD_NAME}, {@link HttpComplianceSection#RFC7230_3_2_FIELD_COLON} + * {@link HttpComplianceSection#METHOD_CASE_SENSITIVE}, {@link HttpComplianceSection#FIELD_COLON} */ - RFC2616_LEGACY(sectionsBySpec("RFC2616,-RFC7230_3_2_FIELD_COLON,-RFC7230_3_1_1_METHOD_CASE_SENSITIVE")), + RFC2616_LEGACY(sectionsBySpec("RFC2616,-FIELD_COLON,-METHOD_CASE_SENSITIVE")), /** The strict RFC2616 support mode */ RFC2616(sectionsBySpec("RFC2616")), - /** Jetty's current RFC7230 support, which incorrectly excludes {@link HttpComplianceSection#RFC7230_3_1_1_METHOD_CASE_SENSITIVE} */ - RFC7230_LEGACY(sectionsBySpec("RFC7230,-RFC7230_3_1_1_METHOD_CASE_SENSITIVE")), + /** Jetty's current RFC7230 support, which incorrectly excludes {@link HttpComplianceSection#METHOD_CASE_SENSITIVE} */ + RFC7230_LEGACY(sectionsBySpec("RFC7230,-METHOD_CASE_SENSITIVE")), /** The RFC7230 support mode */ RFC7230(sectionsBySpec("RFC7230")),