Skip to content

/ hyper

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

Add ENABLE_PUSH flag in the Upgrade HTTP2-Settings header #310

Open
wants to merge 11 commits into
base: development
from
Open

Add ENABLE_PUSH flag in the Upgrade HTTP2-Settings header #310

wants to merge 11 commits into from

Conversation

@hkwi
Copy link
Contributor

hkwi commented Feb 21, 2017

Push flag required for the case the initial upgrade request triggered server push.
@hkwi
Add ENABLE_PUSH flag in the Upgrade HTTP2-Settings header
Loading status checks…
bb868fd 
Push flag required for the case the initial upgrade request
triggered server push.
@Lukasa
Lukasa requested changes Feb 21, 2017
View changes
Copy link
Member

Lukasa left a comment

Thanks for this!

This patch is reasonable, but there are a bunch of tests failing that need to be updated to take account of this change. Do you mind doing that?
@hkwi
Copy link
Contributor Author

hkwi commented Feb 21, 2017

I'll look into.
hkwi added 2 commits Feb 21, 2017
@hkwi
make the http11 connection enable_push optional
Loading status checks…
ec0c0dc 
If enable_push option was not explicitly set, HTTP2-Settings header
will not include ENABLE_PUSH option.
@hkwi
apply autopep8
Loading status checks…
8f33457 
fix for `flake8 --max-complexity 15`
@Lukasa
Lukasa requested changes Feb 21, 2017
View changes
Copy link
Member

Lukasa left a comment

So you've fixed some of the test failures, but you're now not actually testing that this data gets emitted. We do need to add a new test to cover this branch.
hyper/http11/connection.py Outdated
@@ -276,6 +277,9 @@ def _add_upgrade_headers(self, headers):
# Settings header.
http2_settings = SettingsFrame(0)
http2_settings.settings[SettingsFrame.INITIAL_WINDOW_SIZE] = 65535
if self._enable_push is not None:
http2_settings.settings[
SettingsFrame.ENABLE_PUSH] = int(self._enable_push)

This comment has been minimized.

Sign in to view
@Lukasa

Lukasa Feb 21, 2017

Member

Rather than break here, can you do this?

http2_settings.settings[SettingsFrame.ENABLE_PUSH] = (
    int(self._enable_push)
)

This comment has been minimized.

Sign in to view
@hkwi

hkwi Feb 21, 2017

Author Contributor

Yes.
@hkwi
change code formatting
Loading status checks…
ddbaefd
@Lukasa
Lukasa requested changes Feb 21, 2017
View changes
Copy link
Member

Lukasa left a comment

So, as noted, this is not really tested in any sense right now. It would be good to see the appropriate testing changes made.
hkwi added 5 commits Feb 21, 2017
@hkwi
add server push test with h2c upgrade
Loading status checks…
3627093
@hkwi
apply autopep8
Loading status checks…
b770b67
@hkwi
apply autopep8
Loading status checks…
d644eab
@hkwi
apply autopep8
Loading status checks…
ffe0ea1
@hkwi
fix typo
Loading status checks…
7d172ca
@hkwi
Copy link
Contributor Author

hkwi commented Feb 22, 2017

One travis-ci job is failing unexpectedly with empty raw log. Can I ask help?
@Lukasa
Copy link
Member

Lukasa commented Feb 22, 2017

I've restarted that build. =)
hkwi added 2 commits Feb 23, 2017
@hkwi
fix test synchronization
Loading status checks…
7a4c8b6 
Some tests requires synchronization to let the connection
state machine working.
@hkwi
remove unused variable
Loading status checks…
6c56865
@hkwi
Copy link
Contributor Author

hkwi commented Feb 23, 2017

I added http11 h2c upgrading test by inheriting TestServerPush which is for http20 h2, and test passed.
@Lukasa
Lukasa requested changes Feb 23, 2017
View changes
Copy link
Member

Lukasa left a comment

So, I'm not sure about this approach.

You've added getpushes to the HTTP11Connection object with the goal of having it be a dummy method for catching the upgrade. That's understandable, but I'm not sure that this is the way users should be interacting with the abstract method: in particular because if the connection does not upgrade, which the user cannot guarantee will not happen, the response object is lost.

For the purpose of testing it's probably enough to call getresponse and then check for pushes. How does that sound?
@hkwi
Copy link
Contributor Author

hkwi commented Feb 23, 2017 •
edited

I agree that HTTP11Connection.getpushes is a little bit hacky. This was added to meet the strict tests of test_promise_before_headers or test_capture_all_promises. If we don't need to satisfy these tests for http11 upgrade, implementation would be more relaxed style. I'll create another PR for that version later.
BTW, the response will be stored in self._response for later self.get_response call, and would not lost.
@Lukasa
Copy link
Member

Lukasa commented Feb 23, 2017

I think those tests don't need to work for upgrade, but we should write a test that does work as expected (e.g. you get a HTTP/2 response and then look for pushes on that stream)
@hkwi hkwi mentioned this pull request Feb 23, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lukasa Lukasa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@hkwi @Lukasa
You can’t perform that action at this time.