Author: markt
Date: Tue Jul 5 19:11:42 2016
New Revision: 1751532
URL: http://svn.apache.org/viewvc?rev=1751532&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java?rev=1751532&r1=1751531&r2=1751532&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
Tue Jul 5 19:11:42 2016
@@ -22,11 +22,15 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* Parser for an "Authorization" header.
*/
public class Authorization {
+ private static final StringManager sm =
StringManager.getManager(Authorization.class);
+
@SuppressWarnings("unused") // Unused due to buggy client implementations
private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
@@ -119,7 +123,8 @@ public class Authorization {
break;
default:
// Error
- throw new IllegalArgumentException("TODO i18n: Unsupported
type");
+ throw new IllegalArgumentException(
+ sm.getString("authorization.unknownType", type));
}
if (value == null) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties?rev=1751532&r1=1751531&r2=1751532&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Tue Jul 5 19:11:42 2016
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+authorization.unknownType=Unknown Type [{0}]
cookie.fallToDebug=Note: further occurrences of this error will be logged at
DEBUG level.
cookie.invalidCookieValue=A cookie header was received [{0}] that contained an
invalid cookie. That cookie will be ignored.
cookie.invalidCookieVersion=A cookie header was received using an unrecognised
cookie version of [{0}]. The header and the cookies it contains will be ignored.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1751532&r1=1751531&r2=1751532&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Tue Jul 5 19:11:42 2016
@@ -128,7 +128,7 @@ public abstract class SocketWrapperBase<
}
/**
- * Set the timeout for reading. Values of zero or less will be changed to]
+ * Set the timeout for reading. Values of zero or less will be changed to
* -1.
*
* @param readTimeout The timeout in milliseconds. A value of -1 indicates
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
