http_parser.rb 0.5.3 → 0.6.0.beta.1

data/ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/ParserSettings.java

@@ -10,7 +10,7 @@ public class ParserSettings {
   public HTTPDataCallback 	on_fragment;
   public HTTPDataCallback 	on_header_field;
   public HTTPDataCallback 	on_header_value;
-  public HTTPCallback       on_headers_complete;
+  public HTTPHeadersCompleteCallback      on_headers_complete;
   public HTTPDataCallback 	on_body;
   public HTTPCallback       on_message_complete;
   public HTTPErrorCallback  on_error;

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Message.java

@@ -5,11 +5,13 @@ import java.io.*;
 import java.util.*;
 
 import http_parser.HTTPMethod;
+import http_parser.HTTPParserUrl;
 import http_parser.ParserType;
-import http_parser.lolevel.TestLoaderNG.TestSettings;
 import http_parser.lolevel.TestLoaderNG.Header;
 import http_parser.lolevel.TestLoaderNG.LastHeader;
 
+import primitive.collection.ByteList;
+
 import static http_parser.lolevel.Util.str;
 
 public class Message {
@@ -30,7 +32,10 @@ public class Message {
   List<Header> headers;
   boolean should_keep_alive;
 
-  boolean upgrade;
+  byte[] upgrade;
+  boolean upgrade() {
+    return null != upgrade;
+  }
 
   int http_major;
   int http_minor;
@@ -49,6 +54,7 @@ public class Message {
 
   public String toString() {
     StringBuilder b = new StringBuilder();
+    b.append("NAME: "); b.append(name);b.append("\n");
     b.append("type: "); b.append(type);b.append("\n");
     b.append("method: "); b.append(method);b.append("\n");
     b.append("status_code: "); b.append(status_code);b.append("\n");
@@ -97,9 +103,12 @@ public class Message {
         //      //throw new RuntimeException(name);
         //    }
         //   }
-        String str      = str(b, pos, len);
-        String prev_val = settings.map.get(mes);
-        settings.map.put(mes, prev_val + str);
+        //String str    = str(b, pos, len);
+        ByteList list = settings.map.get(mes);
+        for (int i=0; i!=len; ++i) {
+          list.add(b.get(pos+i));
+        }
+        //settings.map.put(mes, prev_val + str);
         //check(value.equals(str), "incorrect "+mes+": "+str);
         if (-1 == pos) {
           throw new RuntimeException("he?");
@@ -118,8 +127,13 @@ public class Message {
 
 
     p.execute(s, buf);
+    if (!p.upgrade) {
+      // call execute again, else parser can't know message is done
+      // if no content length is set.
+      p.execute(s, buf);
+    }
     if (!s.success) {
-      throw new RuntimeException("Test: "+name+"failed");
+      throw new RuntimeException("Test: "+name+" failed");
     }
   } // execute
 
@@ -134,7 +148,7 @@ public class Message {
        */
     p(name);
     for (int i = 2; i != raw.length; ++i) {
-      //  p(i);
+       // p(i);
       HTTPParser   p = new HTTPParser();
       TestSettings s = settings();
       ByteBuffer buf = ByteBuffer.wrap(raw);
@@ -142,13 +156,24 @@ public class Message {
       buf.limit(i);
 
       parse(p,s,buf);
+      if (!p.upgrade) {
+        buf.position(i);
+        buf.limit(olimit);
 
-      buf.position(i);
-      buf.limit(olimit);
-
-      parse(p,s,buf);
-      parse(p,s,buf);
-
+        parse(p,s,buf);
+        if (!p.upgrade) {
+          parse(p,s,buf);
+        } else {
+          if (!upgrade()) {
+            throw new RuntimeException("Test:"+name+"parsed as upgrade, is not");
+          }
+        }
+      
+      } else {
+        if (!upgrade()) {
+          throw new RuntimeException("Test:"+name+"parsed as upgrade, is not");
+        }
+      }
       if (!s.success) {
         p(this);
         throw new RuntimeException("Test: "+name+" failed");
@@ -164,10 +189,7 @@ public class Message {
 
   TestSettings settings() {
     final TestSettings s = new TestSettings(); 
-    s.on_path         = getCB(request_path, "path", s);
-    s.on_query_string = getCB(query_string, "query_string", s);
     s.on_url          = getCB(request_url,  "url", s);
-    s.on_fragment     = getCB(fragment,     "fragment", s);
     s.on_message_begin = new HTTPCallback() {
       public int cb (HTTPParser p) {
         message_begin_called = true;
@@ -206,13 +228,29 @@ public class Message {
         return 0;
       }
     };
-    s.on_headers_complete = new HTTPCallback() {
+    s.on_headers_complete = new HTTPHeadersCompleteCallback() {
       public int cb (HTTPParser p) {
         headers_complete_called = true;
-        String parsed_path  = s.map.get("path");
-        String parsed_query = s.map.get("query_string");
-        String parsed_url   = s.map.get("url");
-        String parsed_frag  = s.map.get("fragment");
+        String parsed_path  = null;
+        String parsed_query = null;
+        String parsed_url   = null;
+        String parsed_frag  = null;
+        
+        try {
+          parsed_url   = new String(s.map.get("url").toArray(),          "UTF8");
+
+          HTTPParserUrl u = new HTTPParserUrl();
+          HTTPParser pp = new HTTPParser();
+          ByteBuffer data = Util.buffer(parsed_url);
+          pp.parse_url(data,false, u);
+          
+          parsed_path  = u.getFieldValue(HTTPParser.UrlFields.UF_PATH, data);
+          parsed_query = u.getFieldValue(HTTPParser.UrlFields.UF_QUERY, data);
+          parsed_frag  = u.getFieldValue(HTTPParser.UrlFields.UF_FRAGMENT, data);
+
+        } catch (java.io.UnsupportedEncodingException uee) {
+          throw new RuntimeException(uee);
+        }
 
         if (!request_path.equals(parsed_path)) {
           throw new RuntimeException(name+": invalid path: "+parsed_path+" should be: "+request_path);
@@ -321,4 +359,16 @@ public class Message {
   static void p(Object o) {
     System.out.println(o);
   }
+
+  static class TestSettings extends ParserSettings {
+    public boolean success;
+    Map<String, ByteList> map;
+    TestSettings () {
+      map = new HashMap<String, ByteList>();
+      map.put("path",         new ByteList());
+      map.put("query_string", new ByteList());
+      map.put("url",          new ByteList());
+      map.put("fragment",     new ByteList());
+    }
+  }
 }

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/ParseUrl.java

@@ -0,0 +1,51 @@
+package http_parser.lolevel;
+
+import http_parser.HTTPParserUrl;
+import static http_parser.lolevel.Util.*;
+
+public class ParseUrl {
+  public static void test(int i) {
+    HTTPParserUrl u = new HTTPParserUrl();
+    HTTPParser p = new HTTPParser();
+    Url test = Url.URL_TESTS[i];
+//    System.out.println(":: " + test.name);
+    int rv = p.parse_url(Util.buffer(test.url),test.is_connect,u);
+    UnitTest.check_equals(rv, test.rv);
+    if(test.rv == 0){
+      UnitTest.check_equals(u, test.u);
+    }
+
+  }
+  public static void test() {
+    p(ParseUrl.class);
+
+    for (int i = 0; i < Url.URL_TESTS.length; i++) {
+      test(i);      
+    }
+  }
+  
+  static void usage() {
+    p("usage: [jre] http_parser.lolevel.ParseUrl [i]");
+    p("             i : optional test case id");
+    p("---------------------------------------------");
+    p("Test Cases:");
+    for (int i =0; i!= Url.URL_TESTS.length; ++i) {
+      p(" "+i+": "+Url.URL_TESTS[i].name);
+    }
+  }
+
+  public static void main (String [] args) {
+    if (0 == args.length) {
+      test();
+    } else {
+      try {
+        int i = Integer.parseInt(args[0]);
+        test(i);
+      } catch (Throwable t) {
+        t.printStackTrace();
+        usage();
+      }
+    
+    }
+  }
+}

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Requests.java

@@ -35,7 +35,7 @@ public class Requests {
   }
 
   public static void test () {
-    
+    p(Requests.class);    
     simple_tests();
     
     List<Message> all = TestLoaderNG.load("tests.dumped");

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Responses.java

@@ -13,6 +13,7 @@ public class Responses {
   
 
   public static void test () {
+    p(Responses.class);
     List<Message> all = TestLoaderNG.load("tests.dumped");
     List<Message> responses = new LinkedList<Message>();
     for (Message m : all) {

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Test.java

@@ -7,7 +7,8 @@ public class Test {
     TestHeaderOverflowError.test();
     TestNoOverflowLongBody.test();
     Responses.test();
-    //Requests.test();
+    ParseUrl.test();
+    Requests.test();
     Upgrade.test();
     WrongContentLength.test();
   }

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestHeaderOverflowError.java

@@ -39,6 +39,7 @@ public class TestHeaderOverflowError {
   }
 
   public static void test () {
+    p(TestHeaderOverflowError.class);
     test(http_parser.ParserType.HTTP_REQUEST);
     test(http_parser.ParserType.HTTP_RESPONSE);
   }

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestLoaderNG.java

@@ -99,7 +99,7 @@ public class TestLoaderNG {
           } 
           else if ("should_keep_alive".equals(key)) 
           {curr.should_keep_alive = (1 == Integer.parseInt(value));}
-          else if ("upgrade".equals(key))      {curr.upgrade           = (1 == Integer.parseInt(value));}
+          else if ("upgrade".equals(key))      { curr.upgrade = toByteArray(value);}
           else if ("http_major".equals(key))   {curr.http_major = Integer.parseInt(value);}
           else if ("http_minor".equals(key))   {curr.http_minor = Integer.parseInt(value);}
         } else {
@@ -189,12 +189,12 @@ public class TestLoaderNG {
 //      for (int i =0; i!= t.raw.length; ++i) {
 //        p(i+":"+t.raw[i]);
 //      }
-      try {
+//      try {
       t.execute_permutations();
-      } catch (Throwable th) {
-        p("failed: "+t.name);
-      }
-      //	t.execute();
+//      } catch (Throwable th) {
+//        p("failed: "+t.name);
+//      }
+      t.execute();
       //	System.exit(0);
     }
   }
@@ -209,15 +209,4 @@ public class TestLoaderNG {
       ,VALUE
   }
 
-  static class TestSettings extends ParserSettings {
-    public boolean success;
-    Map<String, String> map;
-    TestSettings () {
-      map = new HashMap<String, String>();
-      map.put("path", "");
-      map.put("query_string", "");
-      map.put("url", "");
-      map.put("fragment", "");
-    }
-  }
 }

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestNoOverflowLongBody.java

@@ -50,6 +50,7 @@ public class TestNoOverflowLongBody {
   }
 
   public static void test () {
+    p(TestNoOverflowLongBody.class);
     test(http_parser.ParserType.HTTP_REQUEST, 1000);
     test(http_parser.ParserType.HTTP_REQUEST, 100000);
     test(http_parser.ParserType.HTTP_RESPONSE, 1000);

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/UnitTest.java

@@ -110,6 +110,7 @@ public class UnitTest {
 
 
   public static void test () {
+    p(UnitTest.class);
     testErrorFormat();
     testErrorCallback();
   }  

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Upgrade.java

@@ -13,6 +13,7 @@ public class Upgrade {
                                 "Upgrade: WebSocket\r\n\r\n" +
                                 "third key data";
   static void test () {
+    p(Upgrade.class);
     HTTPParser parser = new HTTPParser(ParserType.HTTP_REQUEST);
     ByteBuffer buf    = buffer(upgrade);
     

data/ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Url.java

@@ -0,0 +1,127 @@
+package http_parser.lolevel;
+
+import http_parser.FieldData;
+import http_parser.HTTPParserUrl;
+
+import static http_parser.HTTPParserUrl.*;
+import static http_parser.lolevel.HTTPParser.*;
+
+/**
+ */
+public class Url {
+  
+  public static Url[] URL_TESTS = new Url[]{
+      new Url("proxy request", "http://hostname/", false,
+          new HTTPParserUrl(
+              (1 << UrlFields.UF_SCHEMA.getIndex()) | (1 << UrlFields.UF_HOST.getIndex()) | (1 << UrlFields.UF_PATH.getIndex()),
+              0,
+              new FieldData[]{
+                  new FieldData(0,4),
+                  new FieldData(7,8),
+                  new FieldData(0,0),
+                  new FieldData(15,1),
+                  new FieldData(0,0),
+                  new FieldData(0,0)
+              }),
+          0),
+      new Url("CONNECT request", "hostname:443", true,
+          new HTTPParserUrl(
+              (1 << UrlFields.UF_HOST.getIndex()) | (1 << UrlFields.UF_PORT.getIndex()),
+              443,
+              new FieldData[]{
+                  new FieldData(0,0),
+                  new FieldData(0,8),
+                  new FieldData(9,3),
+                  new FieldData(0,0),
+                  new FieldData(0,0),
+                  new FieldData(0,0)
+              }),
+          0),
+      new Url("proxy ipv6 request", "http://[1:2::3:4]/", false,
+          new HTTPParserUrl(
+              (1 << UrlFields.UF_SCHEMA.getIndex()) | (1 << UrlFields.UF_HOST.getIndex()) | (1 << UrlFields.UF_PATH.getIndex()),
+              0,
+              new FieldData[]{
+                  new FieldData(0,4),
+                  new FieldData(8,8),
+                  new FieldData(0,0),
+                  new FieldData(17,1),
+                  new FieldData(0,0),
+                  new FieldData(0,0)
+              }),
+          0),
+      new Url("CONNECT ipv6 address", "[1:2::3:4]:443", true,
+          new HTTPParserUrl(
+              (1 << UrlFields.UF_HOST.getIndex()) | (1 << UrlFields.UF_PORT.getIndex()),
+              443,
+              new FieldData[]{
+                  new FieldData(0,0),
+                  new FieldData(1,8),
+                  new FieldData(11,3),
+                  new FieldData(0,0),
+                  new FieldData(0,0),
+                  new FieldData(0,0)
+              }),
+          0),
+      new Url("extra ? in query string",
+          "http://a.tbcdn.cn/p/fp/2010c/??fp-header-min.css,fp-base-min.css,fp-channel-min.css,fp-product-min.css,fp-mall-min.css,fp-category-min.css,fp-sub-min.css,fp-gdp4p-min.css,fp-css3-min.css,fp-misc-min.css?t=20101022.css",
+          false,
+          new HTTPParserUrl(
+              (1 << UrlFields.UF_SCHEMA.getIndex()) |
+              (1 << UrlFields.UF_HOST.getIndex()) |
+              (1 << UrlFields.UF_PATH.getIndex()) |
+              (1 << UrlFields.UF_QUERY.getIndex()),
+              0,
+              new FieldData[]{
+                  new FieldData(0,4),
+                  new FieldData(7,10),
+                  new FieldData(0,0),
+                  new FieldData(17,12),
+                  new FieldData(30,187),
+                  new FieldData(0,0)
+              }),
+          0),
+      new Url("proxy empty host",
+          "http://:443/",
+          false,
+          null,
+          1),
+      new Url("proxy empty port",
+          "http://hostname:/",
+          false,
+          null,
+          1),
+      new Url("CONNECT empty host",
+          ":443",
+          true,
+          null,
+          1),
+      new Url("CONNECT empty port",
+          "hostname:",
+          true,
+          null,
+          1),
+      new Url("CONNECT with extra bits",
+          "hostname:443/",
+          true,
+          null,
+          1),
+
+  };
+
+  String name;
+  String url;
+  boolean is_connect;
+  HTTPParserUrl u;
+  int rv;
+  
+  public Url(String name, String url, boolean is_connect, HTTPParserUrl u, int rv) {
+    this.name = name;
+    this.url = url;
+    this.is_connect = is_connect;
+    this.u = u;
+    this.rv = rv;
+  }
+
+
+}