Skip to content

/ servo

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

Fix SnifferManager Panic #4070

Merged
merged 1 commit into from Nov 24, 2014
Merged

Fix SnifferManager Panic #4070

merged 1 commit into from Nov 24, 2014

Conversation

@kparaju
Copy link
Contributor

kparaju commented Nov 22, 2014

Fixes #4046

I tested it by:

./mach test-wpt --include=XMLHttpRequest > old.log
# make code changes
./mach test-wpt --include=XMLHttpRequest > new.log
grep panic old.log # SnifferManager panics
grep panic new.log # No SnifferManager panics
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Nov 22, 2014

Critic review: https://critic.hoppipolla.co.uk/r/3250

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@jdm
Copy link
Member

jdm commented Nov 22, 2014

Commented on Critic!
@jdm
Copy link
Member

jdm commented Nov 23, 2014

Great! Please squash and this can be merged :)
@kparaju
Break out of loop if can't send data
Loading status checks…
9eda82f 
Fixes #4046
@kparaju kparaju force-pushed the kparaju:master-mime-sniffer-failing-4046 branch from 1e32924 to 9eda82f Nov 23, 2014
@kparaju
Copy link
Contributor Author

kparaju commented Nov 23, 2014

Squashed :)
@jdm

This comment has been minimized.

Sign in to view
Copy link

jdm commented on 9eda82f Nov 23, 2014

r+

This comment has been minimized.

Sign in to view
Copy link

jdm replied Nov 24, 2014

@bors: retry
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 9eda82f Nov 23, 2014

saw approval from jdm
at kparaju@9eda82f

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 23, 2014

merging kparaju/servo/master-mime-sniffer-failing-4046 = 9eda82f into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 23, 2014

kparaju/servo/master-mime-sniffer-failing-4046 = 9eda82f merged ok, testing candidate = 8d20356

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 23, 2014

some tests failed:
failure: http://build.servo.org/builders/mac1/builds/258

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 24, 2014

saw approval from jdm
at kparaju@9eda82f

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 24, 2014

merging kparaju/servo/master-mime-sniffer-failing-4046 = 9eda82f into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 24, 2014

kparaju/servo/master-mime-sniffer-failing-4046 = 9eda82f merged ok, testing candidate = 65350bb

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 24, 2014

all tests pass:
success: http://build.servo.org/builders/linux1/builds/47
success: http://build.servo.org/builders/linux2/builds/47
success: http://build.servo.org/builders/android/builds/114
success: http://build.servo.org/builders/mac1/builds/264
success: http://build.servo.org/builders/mac2/builds/264

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Nov 24, 2014

fast-forwarding master to auto = 65350bb
bors-servo pushed a commit that referenced this pull request Nov 23, 2014
bors-servo
auto merge of #4070 : kparaju/servo/master-mime-sniffer-failing-4046,…
Loading status checks…
8d20356 
… r=jdm

Fixes #4046

I tested it by:

    ./mach test-wpt --include=XMLHttpRequest > old.log
    # make code changes
    ./mach test-wpt --include=XMLHttpRequest > new.log
    grep panic old.log # SnifferManager panics
    grep panic new.log # No SnifferManager panics
bors-servo pushed a commit that referenced this pull request Nov 24, 2014
bors-servo
auto merge of #4070 : kparaju/servo/master-mime-sniffer-failing-4046,…
Loading status checks…
65350bb 
… r=jdm

Fixes #4046

I tested it by:

    ./mach test-wpt --include=XMLHttpRequest > old.log
    # make code changes
    ./mach test-wpt --include=XMLHttpRequest > new.log
    grep panic old.log # SnifferManager panics
    grep panic new.log # No SnifferManager panics
@bors-servo bors-servo closed this Nov 24, 2014
@bors-servo bors-servo merged commit 9eda82f into servo:master Nov 24, 2014
1 check passed
1 check passed
default all tests passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

MIME sniffer failing
4 participants
@kparaju @hoppipolla-critic-bot @jdm @bors-servo
You can’t perform that action at this time.