svn commit: r1815786 - in /tomcat/trunk/java/org/apache: jasper/compiler/EncodingDetector.java tomcat/util/http/parser/HttpParser.java

[markt]

Author: markt
Date: Mon Nov 20 09:56:36 2017
New Revision: 1815786

URL: http://svn.apache.org/viewvc?rev=1815786&view=rev
Log:
Fix spelling of octet

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
    tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1815786&r1=1815785&r2=1815786&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Mon Nov 
20 09:56:36 2017
@@ -171,7 +171,7 @@ class EncodingDetector {
             return new BomResult("ISO-10646-UCS-4", 0);
         }
         if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x00) {
-            // UCS-4, unusual octect order (3412)
+            // UCS-4, unusual octet order (3412)
             // REVISIT: What should this be?
             return new BomResult("ISO-10646-UCS-4", 0);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1815786&r1=1815785&r2=1815786&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Mon 
Nov 20 09:56:36 2017
@@ -484,26 +484,26 @@ public class HttpParser {
      *         number of characters read
      */
     static int readHostIPv4(Reader reader, boolean inIPv6) throws IOException {
-        int octect = -1;
-        int octectCount = 1;
+        int octet = -1;
+        int octetCount = 1;
         int c;
         int pos = 0;
 
         do {
             c = reader.read();
             if (c == '.') {
-                if (octect > -1 && octect < 256) {
+                if (octet > -1 && octet < 256) {
                     // Valid
-                    octectCount++;
-                    octect = -1;
+                    octetCount++;
+                    octet = -1;
                 } else {
                     throw new IllegalArgumentException();
                 }
             } else if (isNumeric(c)) {
-                if (octect == -1) {
-                    octect = c - '0';
+                if (octet == -1) {
+                    octet = c - '0';
                 } else {
-                    octect = octect * 10 + c - '0';
+                    octet = octet * 10 + c - '0';
                 }
             } else if (c == ':') {
                 break;
@@ -527,10 +527,10 @@ public class HttpParser {
             pos++;
         } while (true);
 
-        if (octectCount != 4) {
+        if (octetCount != 4) {
             throw new IllegalArgumentException();
         }
-        if (octect < 0 || octect > 255) {
+        if (octet < 0 || octet > 255) {
             throw new IllegalArgumentException();
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org