Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nfuller change alpn npn support #1243

Merged
merged 2 commits into from
Dec 26, 2014
Merged

Conversation

swankjesse
Copy link
Collaborator

No description provided.

nfuller and others added 2 commits December 15, 2014 14:29
Work in progress.

I see a new failure from a certificate pinning test but I don't
know why. Help solving this would be appreciated.

I also see failures before & after:
1) A failure from DisconnectTest
(#1197 may fix that).
2) A failure from CallTest.doesNotFollow21Redirects_Async (timeout)

The maven changes should be treated with the contempt they deserve.
I mostly removed things I didn't understand and stroked maven until
it stopped squealing. The benchmarks / okcurl changes are a
particular mystery.

Tried with arbitrary versions of openjdk7 and openjdk8 I had
lying around. Behavior was the same across both (i.e. the same
failures).
…ler_ChangeAlpnNpnSupport

* nfuller/ChangeAlpnNpnSupport:
  Remove NPN support from OkHttp

Conflicts:
	okhttp/src/main/java/com/squareup/okhttp/Protocol.java
	pom.xml
swankjesse added a commit that referenced this pull request Dec 26, 2014
@swankjesse swankjesse merged commit 050eb79 into master Dec 26, 2014
@swankjesse
Copy link
Collaborator Author

This is a rebase of
#1201

@swankjesse swankjesse deleted the nfuller_ChangeAlpnNpnSupport branch December 27, 2014 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants