Commit25002d5

committed

Merge pull requestAsyncHttpClient#832 from laszlohordos/1.8.x

Update Grizzly version

2 parentsd13f648 +107e89a commit25002d5Copy full SHA for 25002d5

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@`
`591`	`591`	`<compiler.exclude>com/ning/http/client/providers/grizzly/*.java</compiler.exclude>`
`592`	`592`	`<test.compiler.exclude>com/ning/http/client/async/grizzly/*.java</test.compiler.exclude>`
`593`	`593`	`<javadoc.package.exclude>com.ning.http.client.providers.grizzly</javadoc.package.exclude>`
`594`		`- <grizzly.version>2.3.16</grizzly.version>`
	`594`	`+ <grizzly.version>2.3.19</grizzly.version>`
`595`	`595`	`<source.property>1.5</source.property>`
`596`	`596`	`<target.property>1.5</target.property>`
`597`	`597`	`<surefire.version>2.12</surefire.version>`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,10 @@ public void onComplete(Connection connection) {`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`	`}`
	`228`	`+`
	`229`	`+publicvoidonFailure(Connectionconnection,Throwablet) {`
	`230`	`+`
	`231`	`+ }`
`228`	`232`	`});`
`229`	`233`	`filter.handshake(context.getConnection(),null);`
`230`	`234`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ private boolean sendAsGrizzlyRequest(final Request request,`
`932`	`932`	`finalURIwsURI =newURI(httpCtx.wsRequestURI);`
`933`	`933`	`secure ="wss".equalsIgnoreCase(wsURI.getScheme());`
`934`	`934`	`httpCtx.protocolHandler =Version.RFC6455.createHandler(true);`
`935`		`-httpCtx.handshake =httpCtx.protocolHandler.createHandShake(wsURI);`
	`935`	`+httpCtx.handshake =httpCtx.protocolHandler.createClientHandShake(wsURI);`
`936`	`936`	`requestPacket = (HttpRequestPacket)httpCtx.handshake.composeHeaders().getHttpHeader();`
`937`	`937`	`}catch (URISyntaxExceptione) {`
`938`	`938`	`thrownewIllegalArgumentException("Invalid WS URI: " +httpCtx.wsRequestURI);`

Comments

(0)