tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r892521 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/membership/MemberImpl.java java/org/apache/catalina/tribes/util/Arrays.java webapps/docs/changelog.xml
Date Sat, 19 Dec 2009 22:56:25 GMT
Author: markt
Date: Sat Dec 19 22:56:24 2009
New Revision: 892521

URL: http://svn.apache.org/viewvc?rev=892521&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48113
Display IP addresses using 0-255 rather than -128 to +127
Port Filip's patch from trunk plus additional changes based on a patch by Quintin Beukes

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Arrays.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 22:56:24 2009
@@ -1 +1,2 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77
 2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,885038,886019,888072,889363,890349,890417
+/tomcat:883362
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,885038,886019,888072,889363,890349,890417,891583

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892521&r1=892520&r2=892521&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 19 22:56:24 2009
@@ -309,18 +309,6 @@
   +1: markt, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48113
-  Display IP addresses using 0-255 rather than -128 to +127
-  Port Filip's patch from trunk plus additional changes based on a patch by
-  Quintin Beukes
-  http://svn.apache.org/viewvc?view=revision&revision=758249 (Filip)
-  http://svn.apache.org/viewvc?rev=883362&view=rev (Quintin)
-  +1: markt, kkolinko, rjung
-  -1: 
-  http://svn.apache.org/viewvc?rev=891583&view=rev (Quintin)
-  +1: kkolinko, rjung
-  -1:
-
 * Further improvement to memory leak protection - XML parsing
   http://svn.apache.org/viewvc?rev=884341&view=rev
   +1: markt, rjung

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=892521&r1=892520&r2=892521&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Sat Dec
19 22:56:24 2009
@@ -438,7 +438,7 @@
                 if (DO_DNS_LOOKUPS)
                     this.hostname = java.net.InetAddress.getByAddress(host).getHostName();
                 else 
-                    this.hostname = org.apache.catalina.tribes.util.Arrays.toString(host);
+                    this.hostname = org.apache.catalina.tribes.util.Arrays.toString(host,0,host.length,true);
                 return this.hostname;
             }catch ( IOException x ) {
                 throw new RuntimeException("Unable to parse hostname.",x);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Arrays.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Arrays.java?rev=892521&r1=892520&r2=892521&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Arrays.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Arrays.java Sat Dec 19 22:56:24
2009
@@ -56,17 +56,29 @@
     }
 
     public static String toString(byte[] data, int offset, int length) {
+        return toString(data,offset,length,false);
+    }
+
+    public static String toString(byte[] data, int offset, int length, boolean unsigned)
{
         StringBuffer buf = new StringBuffer("{");
         if ( data != null && length > 0 ) {
-            buf.append(data[offset++]);
-            for (int i = offset; i < length; i++) {
-                buf.append(", ").append(data[i]);
+            int i = offset;
+            if (unsigned) {
+                buf.append(data[i++] & 0xff);
+                for (; i < length; i++) {
+                    buf.append(", ").append(data[i] & 0xff);
+                }
+            } else {
+                buf.append(data[i++]);
+                for (; i < length; i++) {
+                    buf.append(", ").append(data[i]);
+                }
             }
         }
         buf.append("}");
         return buf.toString();
     }
-    
+
     public static String toString(Object[] data) {
         return toString(data,0,data!=null?data.length:0);
     }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=892521&r1=892520&r2=892521&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Dec 19 22:56:24 2009
@@ -493,6 +493,10 @@
         <bug>47554</bug>: Include httpOnly attribute when re-writing session
         cookie after fail over. (markt)
       </fix>
+      <fix>
+        <bug>48113</bug>: Display IP addresses using 0 to 255 rather than -128
+        to +127. Based on a patch by Quintin Beukes. (fhanik/kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Webapps">



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


Mime
View raw message