repo/luan: src/org/eclipse/jetty/util/URIUtil.java annotate

annotate src/org/eclipse/jetty/util/URIUtil.java @ 808:b3176fd168bf

replace use of jetty.util.B64Code with java.util.Base64

author	Franklin Schmidt <fschmidt@gmail.com>
date	Thu, 08 Sep 2016 16:13:27 -0600
parents	3428c60d7cfc
children	8e9db0bbf4f9

rev	line source
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	2 // ========================================================================
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	3 // Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	4 // ------------------------------------------------------------------------
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	5 // All rights reserved. This program and the accompanying materials
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	6 // are made available under the terms of the Eclipse Public License v1.0
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	7 // and Apache License v2.0 which accompanies this distribution.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	8 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	9 // The Eclipse Public License is available at
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	10 // http://www.eclipse.org/legal/epl-v10.html
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	11 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	12 // The Apache License v2.0 is available at
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	13 // http://www.opensource.org/licenses/apache2.0.php
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	14 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	15 // You may elect to redistribute this code under either of these licenses.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	16 // ========================================================================
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	17 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	18
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	19 package org.eclipse.jetty.util;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	20
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	21 import java.io.UnsupportedEncodingException;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	22 import java.net.URI;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	23 import java.net.URLEncoder;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	24
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	25 import org.eclipse.jetty.util.log.Log;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	26
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	27
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	28
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	29 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	30 /** URI Holder.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	31 * This class assists with the decoding and encoding or HTTP URI's.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	32 * It differs from the java.net.URL class as it does not provide
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	33 * communications ability, but it does assist with query string
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	34 * formatting.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	35 * <P>UTF-8 encoding is used by default for % encoded characters. This
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	36 * may be overridden with the org.eclipse.jetty.util.URI.charset system property.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	37 * @see UrlEncoded
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	38 *
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	39 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	40 public class URIUtil
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	41 implements Cloneable
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	42 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	43 public static final String SLASH="/";
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	44 public static final String HTTP="http";
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	45 public static final String HTTP_COLON="http:";
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	46 public static final String HTTPS="https";
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	47 public static final String HTTPS_COLON="https:";
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	48
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	49 // Use UTF-8 as per http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	50 public static final String __CHARSET=System.getProperty("org.eclipse.jetty.util.URI.charset",StringUtil.__UTF8);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	51
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	52 private URIUtil()
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	53 {}
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	54
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	55 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	56 /** Encode a URI path.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	57 * This is the same encoding offered by URLEncoder, except that
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	58 * the '/' character is not encoded.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	59 * @param path The path the encode
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	60 * @return The encoded path
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	61 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	62 public static String encodePath(String path)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	63 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	64 if (path==null \|\| path.length()==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	65 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	66
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	67 StringBuilder buf = encodePath(null,path);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	68 return buf==null?path:buf.toString();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	69 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	70
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	71 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	72 /** Encode a URI path.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	73 * @param path The path the encode
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	74 * @param buf StringBuilder to encode path into (or null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	75 * @return The StringBuilder or null if no substitutions required.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	76 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	77 public static StringBuilder encodePath(StringBuilder buf, String path)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	78 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	79 byte[] bytes=null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	80 if (buf==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	81 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	82 loop:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	83 for (int i=0;i<path.length();i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	84 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	85 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	86 switch(c)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	87 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	88 case '%':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	89 case '?':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	90 case ';':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	91 case '#':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	92 case '\'':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	93 case '"':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	94 case '<':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	95 case '>':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	96 case ' ':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	97 buf=new StringBuilder(path.length()*2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	98 break loop;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	99 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	100 if (c>127)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	101 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	102 try
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	103 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	104 bytes=path.getBytes(URIUtil.__CHARSET);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	105 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	106 catch (UnsupportedEncodingException e)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	107 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	108 throw new IllegalStateException(e);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	109 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	110 buf=new StringBuilder(path.length()*2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	111 break loop;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	112 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	113
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	114 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	115 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	116 if (buf==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	117 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	118 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	119
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	120 synchronized(buf)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	121 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	122 if (bytes!=null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	123 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	124 for (int i=0;i<bytes.length;i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	125 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	126 byte c=bytes[i];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	127 switch(c)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	128 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	129 case '%':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	130 buf.append("%25");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	131 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	132 case '?':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	133 buf.append("%3F");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	134 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	135 case ';':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	136 buf.append("%3B");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	137 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	138 case '#':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	139 buf.append("%23");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	140 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	141 case '"':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	142 buf.append("%22");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	143 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	144 case '\'':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	145 buf.append("%27");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	146 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	147 case '<':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	148 buf.append("%3C");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	149 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	150 case '>':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	151 buf.append("%3E");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	152 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	153 case ' ':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	154 buf.append("%20");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	155 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	156 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	157 if (c<0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	158 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	159 buf.append('%');
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	160 TypeUtil.toHex(c,buf);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	161 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	162 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	163 buf.append((char)c);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	164 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	165 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	166 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	167
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	168 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	169 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	170 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	171 for (int i=0;i<path.length();i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	172 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	173 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	174 switch(c)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	175 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	176 case '%':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	177 buf.append("%25");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	178 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	179 case '?':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	180 buf.append("%3F");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	181 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	182 case ';':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	183 buf.append("%3B");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	184 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	185 case '#':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	186 buf.append("%23");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	187 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	188 case '"':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	189 buf.append("%22");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	190 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	191 case '\'':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	192 buf.append("%27");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	193 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	194 case '<':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	195 buf.append("%3C");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	196 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	197 case '>':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	198 buf.append("%3E");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	199 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	200 case ' ':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	201 buf.append("%20");
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	202 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	203 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	204 buf.append(c);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	205 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	206 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	207 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	208 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	209 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	210
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	211 return buf;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	212 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	213
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	214 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	215 /** Encode a URI path.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	216 * @param path The path the encode
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	217 * @param buf StringBuilder to encode path into (or null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	218 * @param encode String of characters to encode. % is always encoded.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	219 * @return The StringBuilder or null if no substitutions required.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	220 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	221 public static StringBuilder encodeString(StringBuilder buf,
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	222 String path,
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	223 String encode)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	224 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	225 if (buf==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	226 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	227 loop:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	228 for (int i=0;i<path.length();i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	229 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	230 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	231 if (c=='%' \|\| encode.indexOf(c)>=0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	232 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	233 buf=new StringBuilder(path.length()<<1);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	234 break loop;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	235 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	236 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	237 if (buf==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	238 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	239 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	240
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	241 synchronized(buf)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	242 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	243 for (int i=0;i<path.length();i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	244 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	245 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	246 if (c=='%' \|\| encode.indexOf(c)>=0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	247 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	248 buf.append('%');
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	249 StringUtil.append(buf,(byte)(0xff&c),16);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	250 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	251 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	252 buf.append(c);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	253 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	254 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	255
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	256 return buf;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	257 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	258
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	259 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	260 /* Decode a URI path and strip parameters
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	261 * @param path The path the encode
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	262 * @param buf StringBuilder to encode path into
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	263 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	264 public static String decodePath(String path)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	265 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	266 if (path==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	267 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	268 // Array to hold all converted characters
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	269 char[] chars=null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	270 int n=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	271 // Array to hold a sequence of %encodings
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	272 byte[] bytes=null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	273 int b=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	274
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	275 int len=path.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	276
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	277 for (int i=0;i<len;i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	278 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	279 char c = path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	280
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	281 if (c=='%' && (i+2)<len)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	282 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	283 if (chars==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	284 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	285 chars=new char[len];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	286 bytes=new byte[len];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	287 path.getChars(0,i,chars,0);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	288 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	289 bytes[b++]=(byte)(0xff&TypeUtil.parseInt(path,i+1,2,16));
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	290 i+=2;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	291 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	292 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	293 else if (c==';')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	294 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	295 if (chars==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	296 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	297 chars=new char[len];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	298 path.getChars(0,i,chars,0);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	299 n=i;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	300 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	301 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	302 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	303 else if (bytes==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	304 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	305 n++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	306 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	307 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	308
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	309 // Do we have some bytes to convert?
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	310 if (b>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	311 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	312 // convert series of bytes and add to chars
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	313 String s;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	314 try
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	315 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	316 s=new String(bytes,0,b,__CHARSET);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	317 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	318 catch (UnsupportedEncodingException e)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	319 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	320 s=new String(bytes,0,b);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	321 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	322 s.getChars(0,s.length(),chars,n);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	323 n+=s.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	324 b=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	325 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	326
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	327 chars[n++]=c;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	328 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	329
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	330 if (chars==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	331 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	332
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	333 // if we have a remaining sequence of bytes
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	334 if (b>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	335 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	336 // convert series of bytes and add to chars
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	337 String s;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	338 try
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	339 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	340 s=new String(bytes,0,b,__CHARSET);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	341 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	342 catch (UnsupportedEncodingException e)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	343 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	344 s=new String(bytes,0,b);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	345 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	346 s.getChars(0,s.length(),chars,n);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	347 n+=s.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	348 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	349
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	350 return new String(chars,0,n);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	351 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	352
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	353 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	354 /* Decode a URI path and strip parameters.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	355 * @param path The path the encode
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	356 * @param buf StringBuilder to encode path into
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	357 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	358 public static String decodePath(byte[] buf, int offset, int length)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	359 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	360 byte[] bytes=null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	361 int n=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	362
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	363 for (int i=0;i<length;i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	364 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	365 byte b = buf[i + offset];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	366
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	367 if (b=='%' && (i+2)<length)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	368 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	369 b=(byte)(0xff&TypeUtil.parseInt(buf,i+offset+1,2,16));
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	370 i+=2;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	371 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	372 else if (b==';')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	373 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	374 length=i;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	375 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	376 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	377 else if (bytes==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	378 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	379 n++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	380 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	381 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	382
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	383 if (bytes==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	384 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	385 bytes=new byte[length];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	386 for (int j=0;j<n;j++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	387 bytes[j]=buf[j + offset];
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	388 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	389
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	390 bytes[n++]=b;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	391 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	392
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	393 if (bytes==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	394 return StringUtil.toString(buf,offset,length,__CHARSET);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	395 return StringUtil.toString(bytes,0,n,__CHARSET);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	396 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	397
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	398
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	399 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	400 /** Add two URI path segments.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	401 * Handles null and empty paths, path and query params (eg ?a=b or
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	402 * ;JSESSIONID=xxx) and avoids duplicate '/'
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	403 * @param p1 URI path segment (should be encoded)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	404 * @param p2 URI path segment (should be encoded)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	405 * @return Legally combined path segments.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	406 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	407 public static String addPaths(String p1, String p2)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	408 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	409 if (p1==null \|\| p1.length()==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	410 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	411 if (p1!=null && p2==null)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	412 return p1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	413 return p2;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	414 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	415 if (p2==null \|\| p2.length()==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	416 return p1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	417
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	418 int split=p1.indexOf(';');
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	419 if (split<0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	420 split=p1.indexOf('?');
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	421 if (split==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	422 return p2+p1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	423 if (split<0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	424 split=p1.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	425
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	426 StringBuilder buf = new StringBuilder(p1.length()+p2.length()+2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	427 buf.append(p1);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	428
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	429 if (buf.charAt(split-1)=='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	430 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	431 if (p2.startsWith(URIUtil.SLASH))
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	432 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	433 buf.deleteCharAt(split-1);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	434 buf.insert(split-1,p2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	435 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	436 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	437 buf.insert(split,p2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	438 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	439 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	440 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	441 if (p2.startsWith(URIUtil.SLASH))
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	442 buf.insert(split,p2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	443 else
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	444 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	445 buf.insert(split,'/');
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	446 buf.insert(split+1,p2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	447 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	448 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	449
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	450 return buf.toString();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	451 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	452
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	453 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	454 /** Return the parent Path.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	455 * Treat a URI like a directory path and return the parent directory.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	456 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	457 public static String parentPath(String p)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	458 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	459 if (p==null \|\| URIUtil.SLASH.equals(p))
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	460 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	461 int slash=p.lastIndexOf('/',p.length()-2);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	462 if (slash>=0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	463 return p.substring(0,slash+1);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	464 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	465 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	466
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	467 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	468 /** Convert a path to a cananonical form.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	469 * All instances of "." and ".." are factored out. Null is returned
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	470 * if the path tries to .. above its root.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	471 * @param path
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	472 * @return path or null.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	473 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	474 public static String canonicalPath(String path)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	475 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	476 if (path==null \|\| path.length()==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	477 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	478
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	479 int end=path.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	480 int start = path.lastIndexOf('/', end);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	481
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	482 search:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	483 while (end>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	484 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	485 switch(end-start)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	486 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	487 case 2: // possible single dot
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	488 if (path.charAt(start+1)!='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	489 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	490 break search;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	491 case 3: // possible double dot
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	492 if (path.charAt(start+1)!='.' \|\| path.charAt(start+2)!='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	493 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	494 break search;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	495 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	496
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	497 end=start;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	498 start=path.lastIndexOf('/',end-1);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	499 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	500
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	501 // If we have checked the entire string
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	502 if (start>=end)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	503 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	504
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	505 StringBuilder buf = new StringBuilder(path);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	506 int delStart=-1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	507 int delEnd=-1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	508 int skip=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	509
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	510 while (end>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	511 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	512 switch(end-start)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	513 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	514 case 2: // possible single dot
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	515 if (buf.charAt(start+1)!='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	516 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	517 if (skip>0 && --skip==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	518 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	519 delStart=start>=0?start:0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	520 if(delStart>0 && delEnd==buf.length() && buf.charAt(delEnd-1)=='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	521 delStart++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	522 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	523 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	524 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	525
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	526 if(start<0 && buf.length()>2 && buf.charAt(1)=='/' && buf.charAt(2)=='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	527 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	528
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	529 if(delEnd<0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	530 delEnd=end;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	531 delStart=start;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	532 if (delStart<0 \|\| delStart==0&&buf.charAt(delStart)=='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	533 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	534 delStart++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	535 if (delEnd<buf.length() && buf.charAt(delEnd)=='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	536 delEnd++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	537 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	538 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	539 if (end==buf.length())
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	540 delStart++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	541
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	542 end=start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	543 while (start>=0 && buf.charAt(start)!='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	544 start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	545 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	546
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	547 case 3: // possible double dot
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	548 if (buf.charAt(start+1)!='.' \|\| buf.charAt(start+2)!='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	549 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	550 if (skip>0 && --skip==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	551 { delStart=start>=0?start:0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	552 if(delStart>0 && delEnd==buf.length() && buf.charAt(delEnd-1)=='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	553 delStart++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	554 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	555 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	556 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	557
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	558 delStart=start;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	559 if (delEnd<0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	560 delEnd=end;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	561
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	562 skip++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	563 end=start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	564 while (start>=0 && buf.charAt(start)!='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	565 start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	566 continue;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	567
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	568 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	569 if (skip>0 && --skip==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	570 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	571 delStart=start>=0?start:0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	572 if(delEnd==buf.length() && buf.charAt(delEnd-1)=='.')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	573 delStart++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	574 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	575 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	576
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	577 // Do the delete
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	578 if (skip<=0 && delStart>=0 && delEnd>=delStart)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	579 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	580 buf.delete(delStart,delEnd);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	581 delStart=delEnd=-1;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	582 if (skip>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	583 delEnd=end;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	584 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	585
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	586 end=start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	587 while (start>=0 && buf.charAt(start)!='/')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	588 start--;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	589 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	590
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	591 // Too many ..
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	592 if (skip>0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	593 return null;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	594
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	595 // Do the delete
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	596 if (delEnd>=0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	597 buf.delete(delStart,delEnd);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	598
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	599 return buf.toString();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	600 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	601
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	602 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	603 /** Convert a path to a compact form.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	604 * All instances of "//" and "///" etc. are factored out to single "/"
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	605 * @param path
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	606 * @return path
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	607 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	608 public static String compactPath(String path)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	609 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	610 if (path==null \|\| path.length()==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	611 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	612
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	613 int state=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	614 int end=path.length();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	615 int i=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	616
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	617 loop:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	618 while (i<end)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	619 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	620 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	621 switch(c)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	622 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	623 case '?':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	624 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	625 case '/':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	626 state++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	627 if (state==2)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	628 break loop;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	629 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	630 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	631 state=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	632 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	633 i++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	634 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	635
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	636 if (state<2)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	637 return path;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	638
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	639 StringBuffer buf = new StringBuffer(path.length());
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	640 buf.append(path,0,i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	641
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	642 loop2:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	643 while (i<end)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	644 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	645 char c=path.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	646 switch(c)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	647 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	648 case '?':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	649 buf.append(path,i,end);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	650 break loop2;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	651 case '/':
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	652 if (state++==0)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	653 buf.append(c);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	654 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	655 default:
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	656 state=0;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	657 buf.append(c);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	658 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	659 i++;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	660 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	661
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	662 return buf.toString();
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	663 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	664
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	665 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	666 /**
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	667 * @param uri URI
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	668 * @return True if the uri has a scheme
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	669 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	670 public static boolean hasScheme(String uri)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	671 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	672 for (int i=0;i<uri.length();i++)
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	673 {
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	674 char c=uri.charAt(i);
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	675 if (c==':')
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	676 return true;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	677 if (!(c>='a'&&c<='z' \|\|
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	678 c>='A'&&c<='Z' \|\|
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	679 (i>0 &&(c>='0'&&c<='9' \|\|
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	680 c=='.' \|\|
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	681 c=='+' \|\|
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	682 c=='-'))
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	683 ))
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	684 break;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	685 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	686 return false;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	687 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	688
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	689 }
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	690
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	691
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	692

Mercurial Hosting > luan

annotate src/org/eclipse/jetty/util/URIUtil.java @ 808:b3176fd168bf