Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 95017 invoked from network); 1 Oct 2003 10:22:24 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 1 Oct 2003 10:22:24 -0000 Received: (qmail 9492 invoked by uid 500); 1 Oct 2003 10:21:50 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 9447 invoked by uid 500); 1 Oct 2003 10:21:49 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 9434 invoked by uid 500); 1 Oct 2003 10:21:49 -0000 Received: (qmail 9431 invoked from network); 1 Oct 2003 10:21:49 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 1 Oct 2003 10:21:49 -0000 Received: (qmail 94991 invoked by uid 1198); 1 Oct 2003 10:22:15 -0000 Date: 1 Oct 2003 10:22:15 -0000 Message-ID: <20031001102215.94990.qmail@minotaur.apache.org> From: hgomez@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N hgomez 2003/10/01 03:22:15 Modified: http11/src/java/org/apache/coyote/http11 Http11Processor.java Log: Replace Tabs by Space (I forgot about Tab Police :) Revision Changes Path 1.81 +98 -98 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java Index: Http11Processor.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- Http11Processor.java 1 Oct 2003 07:54:09 -0000 1.80 +++ Http11Processor.java 1 Oct 2003 10:22:15 -0000 1.81 @@ -322,35 +322,35 @@ } - /** - * Set compression level. - */ - public void setCompression(String compression) { - if (compression.equals("on")) { - this.compressionLevel = 1; - } else if (compression.equals("force")) { - this.compressionLevel = 2; - } else if (compression.equals("off")) { - this.compressionLevel = 0; - } else { - try { - // Try to parse compression as an int, which would give the - // minimum compression size - compressionMinSize = Integer.parseInt(compression); - this.compressionLevel = 1; - } catch (Exception e) { - this.compressionLevel = 0; - } - } - } - - /** - * Set Minimum size to trigger compression. - */ - public void setCompressionMinSize(int compressionMinSize) { - this.compressionMinSize = compressionMinSize; - } - + /** + * Set compression level. + */ + public void setCompression(String compression) { + if (compression.equals("on")) { + this.compressionLevel = 1; + } else if (compression.equals("force")) { + this.compressionLevel = 2; + } else if (compression.equals("off")) { + this.compressionLevel = 0; + } else { + try { + // Try to parse compression as an int, which would give the + // minimum compression size + compressionMinSize = Integer.parseInt(compression); + this.compressionLevel = 1; + } catch (Exception e) { + this.compressionLevel = 0; + } + } + } + + /** + * Set Minimum size to trigger compression. + */ + public void setCompressionMinSize(int compressionMinSize) { + this.compressionMinSize = compressionMinSize; + } + public void setThreadPool(ThreadPool threadPool) { this.threadPool = threadPool; @@ -364,35 +364,35 @@ * @param userAgent user-agent string */ public void addNoCompressionUserAgent(String userAgent) { - addStringArray(noCompressionUserAgents, userAgent); + addStringArray(noCompressionUserAgents, userAgent); } - /** - * Set no compression user agent list (this method is best when used with - * a large number of connectors, where it would be better to have all of - * them referenced a single array). - */ - public void setNoCompressionUserAgents(String[] noCompressionUserAgents) { - this.noCompressionUserAgents = noCompressionUserAgents; - } - - - /** - * Set no compression user agent list. - * List contains users agents separated by ',' : - * - * ie: "gorilla,desesplorer,tigrus" - */ - public void setNoCompressionUserAgents(String noCompressionUserAgents) { - if (noCompressionUserAgents != null) { - StringTokenizer st = new StringTokenizer(noCompressionUserAgents, ","); - - while (st.hasMoreTokens()) { - addNoCompressionUserAgent(st.nextToken().trim()); - } - } - } + /** + * Set no compression user agent list (this method is best when used with + * a large number of connectors, where it would be better to have all of + * them referenced a single array). + */ + public void setNoCompressionUserAgents(String[] noCompressionUserAgents) { + this.noCompressionUserAgents = noCompressionUserAgents; + } + + + /** + * Set no compression user agent list. + * List contains users agents separated by ',' : + * + * ie: "gorilla,desesplorer,tigrus" + */ + public void setNoCompressionUserAgents(String noCompressionUserAgents) { + if (noCompressionUserAgents != null) { + StringTokenizer st = new StringTokenizer(noCompressionUserAgents, ","); + + while (st.hasMoreTokens()) { + addNoCompressionUserAgent(st.nextToken().trim()); + } + } + } /** @@ -411,35 +411,35 @@ * @param userAgent user-agent string */ public void addCompressableMimeType(String mimeType) { - addStringArray(compressableMimeTypes, mimeType); + addStringArray(compressableMimeTypes, mimeType); + } + + + /** + * Set compressable mime-type list (this method is best when used with + * a large number of connectors, where it would be better to have all of + * them referenced a single array). + */ + public void setCompressableMimeTypes(String[] compressableMimeTypes) { + this.compressableMimeTypes = compressableMimeTypes; } - /** - * Set compressable mime-type list (this method is best when used with - * a large number of connectors, where it would be better to have all of - * them referenced a single array). - */ - public void setCompressableMimeTypes(String[] compressableMimeTypes) { - this.compressableMimeTypes = compressableMimeTypes; - } - - - /** - * Set compressable mime-type list - * List contains users agents separated by ',' : - * - * ie: "text/html,text/xml,text/plain" - */ - public void setCompressableMimeTypes(String compressableMimeTypes) { - if (compressableMimeTypes != null) { - StringTokenizer st = new StringTokenizer(compressableMimeTypes, ","); - - while (st.hasMoreTokens()) { - addCompressableMimeType(st.nextToken().trim()); - } - } - } + /** + * Set compressable mime-type list + * List contains users agents separated by ',' : + * + * ie: "text/html,text/xml,text/plain" + */ + public void setCompressableMimeTypes(String compressableMimeTypes) { + if (compressableMimeTypes != null) { + StringTokenizer st = new StringTokenizer(compressableMimeTypes, ","); + + while (st.hasMoreTokens()) { + addCompressableMimeType(st.nextToken().trim()); + } + } + } /** @@ -535,7 +535,7 @@ * @param userAgent user-agent string */ public void addRestrictedUserAgent(String userAgent) { - addStringArray(restrictedUserAgents, userAgent); + addStringArray(restrictedUserAgents, userAgent); } @@ -935,12 +935,12 @@ if (remoteAddr == null) remoteAddr = socket.getInetAddress().getHostAddress(); - request.remoteAddr().setString(remoteAddr); + request.remoteAddr().setString(remoteAddr); if (remoteHost == null) remoteHost = socket.getInetAddress().getHostName(); - request.remoteHost().setString(remoteHost); + request.remoteHost().setString(remoteHost); if (remotePort == -1) remotePort = socket.getPort(); @@ -950,7 +950,7 @@ if (localAddr == null) localAddr = socket.getLocalAddress().getHostAddress(); - request.localAddr().setString(localAddr); + request.localAddr().setString(localAddr); } else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) { if( sslSupport != null) { @@ -1273,9 +1273,9 @@ request.getMimeHeaders().getValue("user-agent"); String userAgentValue = userAgentValueMB.toString(); - // TODO: Use regexp instead of simple string compare (cf: Apache 2.x) - if (inStringArray(noCompressionUserAgents, userAgentValue)) - return false; + // TODO: Use regexp instead of simple string compare (cf: Apache 2.x) + if (inStringArray(noCompressionUserAgents, userAgentValue)) + return false; } // Check if suffisant len to trig the compression @@ -1479,20 +1479,20 @@ int start = bc.getStart(); int end = bc.getEnd(); - // Look for first char - int srcEnd = b.length; + // Look for first char + int srcEnd = b.length; - for (int i = start; i <= (end - srcEnd); i++) { - if (Ascii.toLower(buff[i]) != first) continue; - // found first char, now look for a match + for (int i = start; i <= (end - srcEnd); i++) { + if (Ascii.toLower(buff[i]) != first) continue; + // found first char, now look for a match int myPos = i+1; - for (int srcPos = 1; srcPos < srcEnd; ) { + for (int srcPos = 1; srcPos < srcEnd; ) { if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) - break; + break; if (srcPos == srcEnd) return i - start; // found it - } - } - return -1; + } + } + return -1; } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org