RubyGems - http_parser.rb - Versions diffs - 0.5.1 → 0.6.0.beta.1 - Mend

http_parser.rb 0.5.1 → 0.6.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

data/spec/support/responses.json CHANGED Viewed

@@ -19,7 +19,8 @@
       "Server": "gws",
       "Content-Length": "219  "
     },
-    "body": "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+    "body": "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n",
+    "strict": true
   },
   {
     "name": "no content-length response",
@@ -38,14 +39,15 @@
       "Content-Type": "text/xml; charset=utf-8",
       "Connection": "close"
     },
-    "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n  <SOAP-ENV:Body>\n    <SOAP-ENV:Fault>\n       <faultcode>SOAP-ENV:Client</faultcode>\n       <faultstring>Client Error</faultstring>\n    </SOAP-ENV:Fault>\n  </SOAP-ENV:Body>\n</SOAP-ENV:Envelope>"
+    "body": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n  <SOAP-ENV:Body>\n    <SOAP-ENV:Fault>\n       <faultcode>SOAP-ENV:Client</faultcode>\n       <faultstring>Client Error</faultstring>\n    </SOAP-ENV:Fault>\n  </SOAP-ENV:Body>\n</SOAP-ENV:Envelope>",
+    "strict": true
   },
   {
     "name": "404 no headers no body",
     "type": "HTTP_RESPONSE",
     "raw": "HTTP/1.1 404 Not Found\r\n\r\n",
-    "should_keep_alive": true,
-    "message_complete_on_eof": false,
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
     "http_major": 1,
     "http_minor": 1,
     "status_code": 404,
@@ -54,14 +56,15 @@
     },
     "body_size": 0,
-    "body": ""
+    "body": "",
+    "strict": true
   },
   {
     "name": "301 no response phrase",
     "type": "HTTP_RESPONSE",
     "raw": "HTTP/1.1 301\r\n\r\n",
-    "should_keep_alive": true,
-    "message_complete_on_eof": false,
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
     "http_major": 1,
     "http_minor": 1,
     "status_code": 301,
@@ -69,7 +72,8 @@
     "headers": {
     },
-    "body": ""
+    "body": "",
+    "strict": true
   },
   {
     "name": "200 trailing space on chunked body",
@@ -86,7 +90,8 @@
       "Transfer-Encoding": "chunked"
     },
     "body_size": 65,
-    "body": "This is the data in the first chunk\r\nand this is the second one\r\n"
+    "body": "This is the data in the first chunk\r\nand this is the second one\r\n",
+    "strict": true
   },
   {
     "name": "no carriage ret",
@@ -102,7 +107,8 @@
       "Content-Type": "text/html; charset=utf-8",
       "Connection": "close"
     },
-    "body": "these headers are from http://news.ycombinator.com/"
+    "body": "these headers are from http://news.ycombinator.com/",
+    "strict": true
   },
   {
     "name": "proxy connection",
@@ -120,7 +126,8 @@
       "Proxy-Connection": "close",
       "Date": "Thu, 31 Dec 2009 20:55:48 +0000"
     },
-    "body": "hello world"
+    "body": "hello world",
+    "strict": true
   },
   {
     "name": "underscore header key",
@@ -138,7 +145,8 @@
       "Content-Length": "0",
       "DCLK_imp": "v7;x;114750856;0-0;0;17820020;0/0;21603567/21621457/1;;~okv=;dcmt=text/xml;;~cs=o"
     },
-    "body": ""
+    "body": "",
+    "strict": true
   },
   {
     "name": "bonjourmadame.fr",
@@ -161,28 +169,8 @@
       "Content-Type": "text/html; charset=UTF-8",
       "Connection": "keep-alive"
     },
-    "body": ""
-  },
-  {
-    "name": "field space",
-    "type": "HTTP_RESPONSE",
-    "raw": "HTTP/1.1 200 OK\r\nServer: Microsoft-IIS/6.0\r\nX-Powered-By: ASP.NET\r\nen-US Content-Type: text/xml\r\nContent-Type: text/xml\r\nContent-Length: 16\r\nDate: Fri, 23 Jul 2010 18:45:38 GMT\r\nConnection: keep-alive\r\n\r\n<xml>hello</xml>",
-    "should_keep_alive": true,
-    "message_complete_on_eof": false,
-    "http_major": 1,
-    "http_minor": 1,
-    "status_code": 200,
-    "num_headers": 7,
-    "headers": {
-      "Server": "Microsoft-IIS/6.0",
-      "X-Powered-By": "ASP.NET",
-      "en-US Content-Type": "text/xml",
-      "Content-Type": "text/xml",
-      "Content-Length": "16",
-      "Date": "Fri, 23 Jul 2010 18:45:38 GMT",
-      "Connection": "keep-alive"
-    },
-    "body": "<xml>hello</xml>"
+    "body": "",
+    "strict": true
   },
   {
     "name": "field underscore",
@@ -207,7 +195,8 @@
       "Content-Type": "text/html",
       "Connection": "close"
     },
-    "body": ""
+    "body": "",
+    "strict": true
   },
   {
     "name": "non-ASCII in status line",
@@ -224,6 +213,163 @@
       "Content-Length": "0",
       "Connection": "close"
     },
-    "body": ""
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "http version 0.9",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/0.9 200 OK\r\n\r\n",
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
+    "http_major": 0,
+    "http_minor": 9,
+    "status_code": 200,
+    "num_headers": 0,
+    "headers": {
+    },
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "neither content-length nor transfer-encoding response",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\nhello world",
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 200,
+    "num_headers": 1,
+    "headers": {
+      "Content-Type": "text/plain"
+    },
+    "body": "hello world",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.0 with keep-alive and EOF-terminated 200 status",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.0 200 OK\r\nConnection: keep-alive\r\n\r\n",
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
+    "http_major": 1,
+    "http_minor": 0,
+    "status_code": 200,
+    "num_headers": 1,
+    "headers": {
+      "Connection": "keep-alive"
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.0 with keep-alive and a 204 status",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.0 204 No content\r\nConnection: keep-alive\r\n\r\n",
+    "should_keep_alive": true,
+    "message_complete_on_eof": false,
+    "http_major": 1,
+    "http_minor": 0,
+    "status_code": 204,
+    "num_headers": 1,
+    "headers": {
+      "Connection": "keep-alive"
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.1 with an EOF-terminated 200 status",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.1 200 OK\r\n\r\n",
+    "should_keep_alive": false,
+    "message_complete_on_eof": true,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 200,
+    "num_headers": 0,
+    "headers": {
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.1 with a 204 status",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.1 204 No content\r\n\r\n",
+    "should_keep_alive": true,
+    "message_complete_on_eof": false,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 204,
+    "num_headers": 0,
+    "headers": {
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.1 with a 204 status and keep-alive disabled",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.1 204 No content\r\nConnection: close\r\n\r\n",
+    "should_keep_alive": false,
+    "message_complete_on_eof": false,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 204,
+    "num_headers": 1,
+    "headers": {
+      "Connection": "close"
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "HTTP/1.1 with chunked endocing and a 200 response",
+    "type": "HTTP_RESPONSE",
+    "raw": "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n0\r\n\r\n",
+    "should_keep_alive": true,
+    "message_complete_on_eof": false,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 200,
+    "num_headers": 1,
+    "headers": {
+      "Transfer-Encoding": "chunked"
+    },
+    "body_size": 0,
+    "body": "",
+    "strict": true
+  },
+  {
+    "name": "field space",
+    "type": "HTTP_RESPONSE",
+    "strict": false,
+    "raw": "HTTP/1.1 200 OK\r\nServer: Microsoft-IIS/6.0\r\nX-Powered-By: ASP.NET\r\nen-US Content-Type: text/xml\r\nContent-Type: text/xml\r\nContent-Length: 16\r\nDate: Fri, 23 Jul 2010 18:45:38 GMT\r\nConnection: keep-alive\r\n\r\n<xml>hello</xml>",
+    "should_keep_alive": true,
+    "message_complete_on_eof": false,
+    "http_major": 1,
+    "http_minor": 1,
+    "status_code": 200,
+    "num_headers": 7,
+    "headers": {
+      "Server": "Microsoft-IIS/6.0",
+      "X-Powered-By": "ASP.NET",
+      "en-US Content-Type": "text/xml",
+      "Content-Type": "text/xml",
+      "Content-Length": "16",
+      "Date": "Fri, 23 Jul 2010 18:45:38 GMT",
+      "Connection": "keep-alive"
+    },
+    "body": "<xml>hello</xml>"
   }
 ]

data/tasks/compile.rake CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/extensiontask'
 require 'rake/javaextensiontask'
@@ -6,11 +6,13 @@ def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../http_parser.rb.gemspec', __FILE__)))
 end
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
 end
 if RUBY_PLATFORM =~ /java/
-  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec)
+  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec) do |ext|
+    ext.classpath = File.expand_path('../../ext/ruby_http_parser/vendor/http-parser-java/ext/primitives.jar', __FILE__)
+  end
 else
   Rake::ExtensionTask.new("ruby_http_parser", gemspec) do |ext|
     unless RUBY_PLATFORM =~ /mswin|mingw/

data/tasks/fixtures.rake CHANGED Viewed

@@ -14,13 +14,18 @@ task :fixtures => :submodules do
     tmp.gsub!('TRUE', 'true')
     tmp.gsub!('FALSE', 'false')
+    # mark strict mode tests
+    tmp.gsub!(%r|#if\s+!HTTP_PARSER_STRICT(.+?)#endif\s*/\*\s*!HTTP_PARSER_STRICT.+\n|m){
+      $1.gsub(/^(.+,\.type= .+)$/, "\\1\n,  .strict= false")
+    }
     # remove macros and comments
-    tmp.gsub!(/^#define.+$/,'')
+    tmp.gsub!(/^#(if|elif|endif|define).+$/,'')
     tmp.gsub!(/\/\*(.+?)\*\/$/,'')
     # HTTP_* enums become strings
     tmp.gsub!(/(= )(HTTP_\w+)/){
-      "#{$1}#{$2.dump}"
+      "#{$1}#{$2.sub('MSEARCH','M-SEARCH').dump}"
     }
     # join multiline strings for body and raw data
@@ -55,6 +60,7 @@ task :fixtures => :submodules do
     results.map{ |res|
       res[:headers] and res[:headers] = Hash[*res[:headers].flatten]
       res[:method]  and res[:method].gsub!(/^HTTP_/, '')
+      res[:strict] = true unless res.has_key?(:strict)
     }
     # write to a file