From 8905b979ec3ed1ccd1a02374e44bb50b5aa36767 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 28 Jul 2014 15:27:17 +1000 Subject: [PATCH] RFC7238 Permanent Redirect 308 defined --- .../org/eclipse/jetty/http/HttpStatus.java | 131 ++++++++++-------- 1 file changed, 73 insertions(+), 58 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java index 7db1fa64ff0..881acbd679b 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java @@ -29,10 +29,12 @@ package org.eclipse.jetty.http; * Enum * Code * Message - * + * * RFC 1945 - HTTP/1.0 + * + * RFC 7231 - HTTP/1.1 Semantics and Content * - * RFC 2616 - HTTP/1.1 + * RFC 7238 - HTTP/1.1 Permanent Redirect * * RFC 2518 - WEBDAV * @@ -48,7 +50,7 @@ package org.eclipse.jetty.http; * Continue *   * - * Sec. 10.1.1 + * Sec. 6.2.1 *   * * @@ -57,7 +59,7 @@ package org.eclipse.jetty.http; * Switching Protocols *   * - * Sec. 10.1.2 + * Sec. 6.2.2 *   * * @@ -82,7 +84,7 @@ package org.eclipse.jetty.http; * * Sec. 9.2 * - * Sec. 10.2.1 + * Sec. 6.3.1 *   * * @@ -92,7 +94,7 @@ package org.eclipse.jetty.http; * * Sec. 9.2 * - * Sec. 10.2.2 + * Sec. 6.3.2 *   * * @@ -102,7 +104,7 @@ package org.eclipse.jetty.http; * * Sec. 9.2 * - * Sec. 10.2.3 + * Sec. 6.3.3 *   * * @@ -111,7 +113,7 @@ package org.eclipse.jetty.http; * Non Authoritative Information *   * - * Sec. 10.2.4 + * Sec. 6.3.4 *   * * @@ -121,7 +123,7 @@ package org.eclipse.jetty.http; * * Sec. 9.2 * - * Sec. 10.2.5 + * Sec. 6.3.5 *   * * @@ -130,7 +132,7 @@ package org.eclipse.jetty.http; * Reset Content *   * - * Sec. 10.2.6 + * Sec. 6.3.6 *   * * @@ -139,7 +141,7 @@ package org.eclipse.jetty.http; * Partial Content *   * - * Sec. 10.2.7 + * Sec. 6.3.7 *   * * @@ -175,7 +177,7 @@ package org.eclipse.jetty.http; * * Sec. 9.3 * - * Sec. 10.3.1 + * Sec. 6.4.1 *   * * @@ -185,7 +187,7 @@ package org.eclipse.jetty.http; * * Sec. 9.3 * - * Sec. 10.3.2 + * Sec. 6.4.2 *   * * @@ -203,7 +205,7 @@ package org.eclipse.jetty.http; * Found * (was "302 Moved Temporarily") * - * Sec. 10.3.3 + * Sec. 6.4.3 *   * * @@ -212,7 +214,7 @@ package org.eclipse.jetty.http; * See Other *   * - * Sec. 10.3.4 + * Sec. 6.4.4 *   * * @@ -222,7 +224,7 @@ package org.eclipse.jetty.http; * * Sec. 9.3 * - * Sec. 10.3.5 + * Sec. 6.4.5 *   * * @@ -231,7 +233,7 @@ package org.eclipse.jetty.http; * Use Proxy *   * - * Sec. 10.3.6 + * Sec. 6.4.6 *   * * @@ -240,7 +242,7 @@ package org.eclipse.jetty.http; * (Unused) *   * - * Sec. 10.3.7 + * Sec. 6.4.7 *   * * @@ -249,7 +251,17 @@ package org.eclipse.jetty.http; * Temporary Redirect *   * - * Sec. 10.3.8 + * Sec. 6.4.8 + *   + * + * + * + * {@link #PERMANENT_REDIRECT_308} + * 307 + * Permanent Redirect + *   + * + * RFC7238 *   * * @@ -265,7 +277,7 @@ package org.eclipse.jetty.http; * * Sec. 9.4 * - * Sec. 10.4.1 + * Sec. 6.5.1 *   * * @@ -275,7 +287,7 @@ package org.eclipse.jetty.http; * * Sec. 9.4 * - * Sec. 10.4.2 + * Sec. 6.5.2 *   * * @@ -285,7 +297,7 @@ package org.eclipse.jetty.http; * * Sec. 9.4 * - * Sec. 10.4.3 + * Sec. 6.5.3 *   * * @@ -295,7 +307,7 @@ package org.eclipse.jetty.http; * * Sec. 9.4 * - * Sec. 10.4.4 + * Sec. 6.5.4 *   * * @@ -305,7 +317,7 @@ package org.eclipse.jetty.http; * * Sec. 9.4 * - * Sec. 10.4.5 + * Sec. 6.5.5 *   * * @@ -314,7 +326,7 @@ package org.eclipse.jetty.http; * Method Not Allowed *   * - * Sec. 10.4.6 + * Sec. 6.5.6 *   * * @@ -323,7 +335,7 @@ package org.eclipse.jetty.http; * Not Acceptable *   * - * Sec. 10.4.7 + * Sec. 6.5.7 *   * * @@ -332,7 +344,7 @@ package org.eclipse.jetty.http; * Proxy Authentication Required *   * - * Sec. 10.4.8 + * Sec. 6.5.8 *   * * @@ -341,7 +353,7 @@ package org.eclipse.jetty.http; * Request Timeout *   * - * Sec. 10.4.9 + * Sec. 6.5.9 *   * * @@ -350,7 +362,7 @@ package org.eclipse.jetty.http; * Conflict *   * - * Sec. 10.4.10 + * Sec. 10.4.10 * *   * @@ -360,7 +372,7 @@ package org.eclipse.jetty.http; * Gone *   * - * Sec. 10.4.11 + * Sec. 10.4.11 * *   * @@ -370,7 +382,7 @@ package org.eclipse.jetty.http; * Length Required *   * - * Sec. 10.4.12 + * Sec. 10.4.12 * *   * @@ -380,7 +392,7 @@ package org.eclipse.jetty.http; * Precondition Failed *   * - * Sec. 10.4.13 + * Sec. 10.4.13 * *   * @@ -390,7 +402,7 @@ package org.eclipse.jetty.http; * Request Entity Too Large *   * - * Sec. 10.4.14 + * Sec. 10.4.14 * *   * @@ -400,7 +412,7 @@ package org.eclipse.jetty.http; * Request-URI Too Long *   * - * Sec. 10.4.15 + * Sec. 10.4.15 * *   * @@ -410,7 +422,7 @@ package org.eclipse.jetty.http; * Unsupported Media Type *   * - * Sec. 10.4.16 + * Sec. 10.4.16 * *   * @@ -420,7 +432,7 @@ package org.eclipse.jetty.http; * Requested Range Not Satisfiable *   * - * Sec. 10.4.17 + * Sec. 10.4.17 * *   * @@ -430,7 +442,7 @@ package org.eclipse.jetty.http; * Expectation Failed *   * - * Sec. 10.4.18 + * Sec. 10.4.18 * *   * @@ -537,7 +549,7 @@ package org.eclipse.jetty.http; * * Sec. 9.5 * - * Sec. 10.5.1 + * Sec. 6.6.1 *   * * @@ -547,7 +559,7 @@ package org.eclipse.jetty.http; * * Sec. 9.5 * - * Sec. 10.5.2 + * Sec. 6.6.2 *   * * @@ -557,7 +569,7 @@ package org.eclipse.jetty.http; * * Sec. 9.5 * - * Sec. 10.5.3 + * Sec. 6.6.3 *   * * @@ -567,7 +579,7 @@ package org.eclipse.jetty.http; * * Sec. 9.5 * - * Sec. 10.5.4 + * Sec. 6.6.4 *   * * @@ -576,7 +588,7 @@ package org.eclipse.jetty.http; * Gateway Timeout *   * - * Sec. 10.5.5 + * Sec. 6.6.5 *   * * @@ -585,7 +597,7 @@ package org.eclipse.jetty.http; * HTTP Version Not Supported *   * - * Sec. 10.5.6 + * Sec. 6.6.6 *   * * @@ -633,6 +645,7 @@ public class HttpStatus public final static int NOT_MODIFIED_304 = 304; public final static int USE_PROXY_305 = 305; public final static int TEMPORARY_REDIRECT_307 = 307; + public final static int PERMANENT_REDIRECT_308 = 308; public final static int BAD_REQUEST_400 = 400; public final static int UNAUTHORIZED_401 = 401; @@ -683,7 +696,7 @@ public class HttpStatus /* * -------------------------------------------------------------------- * Informational messages in 1xx series. As defined by ... RFC 1945 - - * HTTP/1.0 RFC 2616 - HTTP/1.1 RFC 2518 - WebDAV + * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV */ /** 100 Continue */ @@ -696,7 +709,7 @@ public class HttpStatus /* * -------------------------------------------------------------------- * Success messages in 2xx series. As defined by ... RFC 1945 - HTTP/1.0 - * RFC 2616 - HTTP/1.1 RFC 2518 - WebDAV + * RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV */ /** 200 OK */ @@ -719,7 +732,7 @@ public class HttpStatus /* * -------------------------------------------------------------------- * Redirection messages in 3xx series. As defined by ... RFC 1945 - - * HTTP/1.0 RFC 2616 - HTTP/1.1 + * HTTP/1.0 RFC 7231 - HTTP/1.1 */ /** 300 Mutliple Choices */ @@ -738,11 +751,13 @@ public class HttpStatus USE_PROXY(USE_PROXY_305, "Use Proxy"), /** 307 Temporary Redirect */ TEMPORARY_REDIRECT(TEMPORARY_REDIRECT_307, "Temporary Redirect"), + /** 308 Permanent Redirect */ + PERMANET_REDIRECT(PERMANENT_REDIRECT_308, "Permanent Redirect"), /* * -------------------------------------------------------------------- * Client Error messages in 4xx series. As defined by ... RFC 1945 - - * HTTP/1.0 RFC 2616 - HTTP/1.1 RFC 2518 - WebDAV + * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV */ /** 400 Bad Request */ @@ -791,7 +806,7 @@ public class HttpStatus /* * -------------------------------------------------------------------- * Server Error messages in 5xx series. As defined by ... RFC 1945 - - * HTTP/1.0 RFC 2616 - HTTP/1.1 RFC 2518 - WebDAV + * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV */ /** 500 Server Error */ @@ -844,7 +859,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Informational message category as defined in the RFC 1945 - HTTP/1.0, - * and RFC 2616 - + * and RFC 7231 - * HTTP/1.1. * * @return true if within range of codes that belongs to @@ -859,7 +874,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Success message category as defined in the RFC 1945 - HTTP/1.0, - * and RFC 2616 - + * and RFC 7231 - * HTTP/1.1. * * @return true if within range of codes that belongs to @@ -874,7 +889,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Redirection message category as defined in the RFC 1945 - HTTP/1.0, - * and RFC 2616 - + * and RFC 7231 - * HTTP/1.1. * * @return true if within range of codes that belongs to @@ -889,7 +904,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Client Error message category as defined in the RFC 1945 - HTTP/1.0, - * and RFC 2616 - + * and RFC 7231 - * HTTP/1.1. * * @return true if within range of codes that belongs to @@ -904,7 +919,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Server Error message category as defined in the RFC 1945 - HTTP/1.0, - * and RFC 2616 - + * and RFC 7231 - * HTTP/1.1. * * @return true if within range of codes that belongs to @@ -958,7 +973,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Informational message category as defined in the RFC 1945 - HTTP/1.0, and RFC 2616 - HTTP/1.1. + * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1. * * @param code * the code to test. @@ -974,7 +989,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Success message category as defined in the RFC 1945 - HTTP/1.0, and RFC 2616 - HTTP/1.1. + * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1. * * @param code * the code to test. @@ -990,7 +1005,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Redirection message category as defined in the RFC 1945 - HTTP/1.0, and RFC 2616 - HTTP/1.1. + * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1. * * @param code * the code to test. @@ -1006,7 +1021,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Client Error message category as defined in the RFC 1945 - HTTP/1.0, and RFC 2616 - HTTP/1.1. + * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1. * * @param code * the code to test. @@ -1022,7 +1037,7 @@ public class HttpStatus * Simple test against an code to determine if it falls into the * Server Error message category as defined in the RFC 1945 - HTTP/1.0, and RFC 2616 - HTTP/1.1. + * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1. * * @param code * the code to test.