You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/04/29 18:46:39 UTC
svn commit: r1741664 - in /tomcat/trunk/java/org/apache/tomcat:
jni/Socket.java util/http/parser/Authorization.java
util/http/parser/LocalStrings.properties
Author: markt
Date: Fri Apr 29 16:46:38 2016
New Revision: 1741664
URL: http://svn.apache.org/viewvc?rev=1741664&view=rev
Log:
Clean-up
- i18n TODO
- Remove completed TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1741664&r1=1741663&r2=1741664&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Fri Apr 29 16:46:38 2016
@@ -76,11 +76,6 @@ public class Socket {
public static final int APR_IPV4_ADDR_OK = 0x01;
public static final int APR_IPV6_ADDR_OK = 0x02;
- /* TODO: Missing:
- * APR_INET
- * APR_UNSPEC
- * APR_INET6
- */
public static final int APR_UNSPEC = 0;
public static final int APR_INET = 1;
public static final int APR_INET6 = 2;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java?rev=1741664&r1=1741663&r2=1741664&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java Fri Apr 29 16:46:38 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/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties?rev=1741664&r1=1741663&r2=1741664&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties Fri Apr 29 16:46:38 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org