websocket-driver 0.3.2-java → 0.3.3-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2bec6e8f91e91b51b1cc98336ebcceee6f32e494
4
- data.tar.gz: 53c2c5fbacfe1a4d98e3f67c8e0729a75f77070a
3
+ metadata.gz: 71d2ed02ffe991eaaf9791b5c82e7aafb0e53c85
4
+ data.tar.gz: a534e7f241320d24d535835616bed14016d15de4
5
5
  SHA512:
6
- metadata.gz: bb6c2cddd455a97acab01a17cefd141868210431046c2b99a6ccc5649bb249fae737e7d090039b035b30c22ae871510c0c438a9c7571469d81c02a98d9d420ac
7
- data.tar.gz: eaec2701ec99d6fff46d71fd902619382ccd932cd0c53f4e13e68c223b2fd359adfa58ad7b58ee18b02575ea2d87285a42a0cef8fc77eabe407330ae58c82594
6
+ metadata.gz: 16a8b8bc4b8cc384574f8675381f2f6bd5fd71ac9c387ba93b65f175dc9680e18aad85f897e39f771e79db4e3b56a96bf96cb15ba1ff10a61e82b7f6bcee0431
7
+ data.tar.gz: 5251701e7f6493a3077855d35e827046334f2c67cbaa09dcedc1e703c271597809cff8ab030c7570235f559894ac2b60353001d4b61148f69608f9d1624b6513
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ### 0.3.3 / 2014-04-24
2
+
3
+ * Fix problems with loading C and Java native extension code
4
+ * Correct the acceptable characters used in the HTTP parser
5
+ * Correct the draft-76 status line reason phrase
6
+
1
7
  ### 0.3.2 / 2013-12-29
2
8
 
3
9
  * Expand `max_length` to cover sequences of continuation frames and `draft-{75,76}`
data/README.md CHANGED
@@ -308,7 +308,7 @@ after `emit('open')` has fired.
308
308
 
309
309
  (The MIT License)
310
310
 
311
- Copyright (c) 2010-2013 James Coglan
311
+ Copyright (c) 2010-2014 James Coglan
312
312
 
313
313
  Permission is hereby granted, free of charge, to any person obtaining a copy of
314
314
  this software and associated documentation files (the 'Software'), to deal in
File without changes
@@ -17,7 +17,7 @@ module WebSocket
17
17
  class Driver
18
18
 
19
19
  root = File.expand_path('../driver', __FILE__)
20
- require root + '/../../websocket_mask'
20
+ require 'websocket_mask'
21
21
 
22
22
  if RUBY_PLATFORM =~ /java/
23
23
  require 'jruby'
@@ -32,7 +32,7 @@ module WebSocket
32
32
  private
33
33
 
34
34
  def handshake_response
35
- upgrade = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
35
+ upgrade = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
36
36
  upgrade << "Upgrade: WebSocket\r\n"
37
37
  upgrade << "Connection: Upgrade\r\n"
38
38
  upgrade << "Sec-WebSocket-Origin: #{@socket.env['HTTP_ORIGIN']}\r\n"
@@ -86,7 +86,7 @@ module WebSocket
86
86
 
87
87
  def big_endian(number)
88
88
  string = ''
89
- [24,16,8,0].each do |offset|
89
+ [24, 16, 8, 0].each do |offset|
90
90
  string << (number >> offset & 0xFF).chr
91
91
  end
92
92
  string
@@ -6,7 +6,7 @@ module WebSocket
6
6
  CR = 0x0D
7
7
  LF = 0x0A
8
8
 
9
- HEADER_LINE = /^([!#\$%&'\*\+\-\.\^_`\|~0-9a-z]+):\s*((?:\t|[\x20-\x7e])*?)\s*$/i
9
+ HEADER_LINE = /^([!#\$%&'\*\+\-\.\\\^_`\|~0-9a-z]+):\s*([\x20-\x7e]*?)\s*$/i
10
10
 
11
11
  attr_reader :headers
12
12
 
@@ -4,7 +4,7 @@ module WebSocket
4
4
  class Request
5
5
  include Headers
6
6
 
7
- REQUEST_LINE = /^([A-Z]+) +([\x21-\x7e]+) +(HTTP\/[0-9]\.[0-9])$/
7
+ REQUEST_LINE = /^(OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT) ([\x21-\x7e]+) (HTTP\/[0-9]+\.[0-9]+)$/
8
8
  REQUEST_TARGET = /^(.*?)(\?(.*))?$/
9
9
  RESERVED_HEADERS = %w[content-length content-type]
10
10
 
@@ -4,7 +4,7 @@ module WebSocket
4
4
  class Response
5
5
  include Headers
6
6
 
7
- STATUS_LINE = /^(HTTP\/[0-9]\.[0-9]) +([0-9]{3}) +(.*)$/
7
+ STATUS_LINE = /^(HTTP\/[0-9]+\.[0-9]+) ([0-9]{3}) ([\x20-\x7e]+)$/
8
8
 
9
9
  attr_reader :code
10
10
 
@@ -0,0 +1,2 @@
1
+ # Load C native extension
2
+ require "websocket-driver/websocket_mask"
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: websocket-driver
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: java
6
6
  authors:
7
7
  - James Coglan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-29 00:00:00.000000000 Z
11
+ date: 2014-04-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eventmachine
@@ -61,10 +61,11 @@ extra_rdoc_files:
61
61
  files:
62
62
  - README.md
63
63
  - CHANGELOG.md
64
- - ext/websocket_mask/websocket_mask.c
65
- - ext/websocket_mask/WebsocketMaskService.java
66
- - ext/websocket_mask/extconf.rb
64
+ - ext/websocket-driver/websocket_mask.c
65
+ - ext/websocket-driver/WebsocketMaskService.java
66
+ - ext/websocket-driver/extconf.rb
67
67
  - examples/tcp_server.rb
68
+ - lib/websocket/websocket_mask.rb
68
69
  - lib/websocket/driver.rb
69
70
  - lib/websocket/http.rb
70
71
  - lib/websocket/http/request.rb