svn commit: r466602 - /tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java

[markt]

Author: markt
Date: Sat Oct 21 16:00:16 2006
New Revision: 466602

URL: http://svn.apache.org/viewvc?view=rev&rev=466602
Log:
Undo unintentional changes in license update.

Modified:
    
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java?view=diff&rev=466602&r1=466601&r2=466602
==============================================================================
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 Sat Oct 21 16:00:16 2006
@@ -24,8 +24,8 @@
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.StringTokenizer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -189,7 +189,7 @@
     /**
      * List of restricted user agents.
      */
-    protected RE[] restrictedUserAgents = null;
+    protected Pattern[] restrictedUserAgents = null;
 
 
     /**
@@ -286,7 +286,7 @@
     /**
      * List of user agents to not use gzip with
      */
-    protected RE noCompressionUserAgents[] = null;
+    protected Pattern noCompressionUserAgents[] = null;
 
     /**
      * List of MIMES which could be gzipped
@@ -387,10 +387,10 @@
      */
     public void addNoCompressionUserAgent(String userAgent) {
         try {
-            RE nRule = new RE(userAgent);
+            Pattern nRule = Pattern.compile(userAgent);
             noCompressionUserAgents =
                 addREArray(noCompressionUserAgents, nRule);
-        } catch (RESyntaxException pse) {
+        } catch (PatternSyntaxException pse) {
             log.error(sm.getString("http11processor.regexp.error", userAgent), 
pse);
         }
     }
@@ -401,7 +401,7 @@
      * a large number of connectors, where it would be better to have all of
      * them referenced a single array).
      */
-    public void setNoCompressionUserAgents(RE[] noCompressionUserAgents) {
+    public void setNoCompressionUserAgents(Pattern[] noCompressionUserAgents) {
         this.noCompressionUserAgents = noCompressionUserAgents;
     }
 
@@ -524,14 +524,14 @@
      * @param rArray the REArray
      * @param value Obj
      */
-    private RE[] addREArray(RE rArray[], RE value) {
-        RE[] result = null;
+    private Pattern[] addREArray(Pattern rArray[], Pattern value) {
+        Pattern[] result = null;
         if (rArray == null) {
-            result = new RE[1];
+            result = new Pattern[1];
             result[0] = value;
         }
         else {
-            result = new RE[rArray.length + 1];
+            result = new Pattern[rArray.length + 1];
             for (int i = 0; i < rArray.length; i++)
                 result[i] = rArray[i];
             result[rArray.length] = value;
@@ -583,9 +583,9 @@
      */
     public void addRestrictedUserAgent(String userAgent) {
         try {
-            RE nRule = new RE(userAgent);
+            Pattern nRule = Pattern.compile(userAgent);
             restrictedUserAgents = addREArray(restrictedUserAgents, nRule);
-        } catch (RESyntaxException pse) {
+        } catch (PatternSyntaxException pse) {
             log.error(sm.getString("http11processor.regexp.error", userAgent), 
pse);
         }
     }
@@ -596,7 +596,7 @@
      * a large number of connectors, where it would be better to have all of
      * them referenced a single array).
      */
-    public void setRestrictedUserAgents(RE[] restrictedUserAgents) {
+    public void setRestrictedUserAgents(Pattern[] restrictedUserAgents) {
         this.restrictedUserAgents = restrictedUserAgents;
     }
 
@@ -1244,7 +1244,7 @@
             if(userAgentValueMB != null) {
                 String userAgentValue = userAgentValueMB.toString();
                 for (int i = 0; i < restrictedUserAgents.length; i++) {
-                    if (restrictedUserAgents[i].match(userAgentValue)) {
+                    if 
(restrictedUserAgents[i].matcher(userAgentValue).matches()) {
                         http11 = false;
                         keepAlive = false;
                         break;
@@ -1462,7 +1462,7 @@
 
                 // If one Regexp rule match, disable compression
                 for (int i = 0; i < noCompressionUserAgents.length; i++)
-                    if (noCompressionUserAgents[i].match(userAgentValue))
+                    if 
(noCompressionUserAgents[i].matcher(userAgentValue).matches())
                         return false;
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]