changed logger error messages to MRI format
Merge pull request #262 from jsaak/mri-error-messages

changed logger error messages to MRI format
handle exceptions in rack parsing of the query string
Merge pull request #268 from postrank-labs/query-string-parse

handle exceptions in rack parsing of the query string
Avoid mutex from trap context
Merge pull request #271 from rubencaro/avoid_mutex_from_trap_context

Avoid mutex from trap context Ruby2
Use an empty string for SCRIPT_NAME.

Rack's 'path' method gets the value joining script_name + path_info.
If we set both variables to uri.path we end up with a path repeated
when calling the 'path' method.
Merge pull request #274 from Juanmcuello/script-name

Use an empty string for SCRIPT_NAME.
fixed websockets test
stopping server message was removed
fixed dependency hell for Ruby 1.9.2
Merge pull request #277 from marcoow/master

- guard ~> 2.0 depends on listen ~> 2.0 which requires Ruby 1.9.3 so that breaks the build fr 1.9.2
- the web socket test expects the data directly while #receive returns a WebSocket::Frame::Incoming::Client (probably due to a change in em-websocket I guess?)
- the "stopping server..." log message seems to have been removed so I removed the assertion
Update required http_parser.rb gem version to prevent collision with em-http-request
Merge pull request #278 from bobes/master

Update required http_parser.rb gem version to prevent collision with em-http-request
Remove GOLIATH_ENV thread local from connection setup,

There is no need to set it here, as it's set later in API class.

See also https://github.com/postrank-labs/goliath/pull/279
Merge pull request #281 from Juanmcuello/goliath-env

Remove GOLIATH_ENV thread local from connection setup,
Add missed line of code
Merge pull request #290 from rezwyi/fix_api_proxy_example

Add missed line of code to examples/api_proxy.rb
Merge remote-tracking branch 'upstream/master' into ensure-the-log-block-finishes-when-issuing-test-requests