Skip to content

Fix faulty write buffer behavior when sending large data chunks over TLS (Mac OS X only) #150

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 2, 2020
Merged

Fix faulty write buffer behavior when sending large data chunks over TLS (Mac OS X only) #150

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6385382
Reproduce faulty write buffer behavior on Mac OS X
clue Apr 30, 2020
3eb342d
Only report write error when write fails with error and nothing written
clue Apr 30, 2020
26d5640
Simplify Travis CI test matrix for Mac OS X setup
clue Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,17 @@ matrix:
- php: hhvm-3.18
install:
- composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
- os: osx
- name: Mac OS X
os: osx
language: generic
php: 7.0 # just to look right on travis
env:
- PACKAGE: php70
before_install:
- curl -s http://getcomposer.org/installer | php
- mv composer.phar /usr/local/bin/composer
allow_failures:
- php: hhvm-3.18
- os: osx
Copy link
Member

@WyriHaximus WyriHaximus Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove it from allowed failures as well? Since this now includes a fix for Mac OS of significant impact I would feel more secure that we secure we force it to also pass on OS X

Copy link
Member Author

@clue clue Apr 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we can.

The test suite works just fine on all platforms (including Mac OS X) before applying this PR and thereafter. I don't think this PR has any effect on whether Mac OS X build failures should be reported, but I can see that this could be useful in the long run.

We've put this on allow_failures because Travis' Mac OS X integration felt somewhat beta (#112), but I don't think we've seen significant problems since then, so I'm fine with it either way.

What do you think?

Copy link
Member

@WyriHaximus WyriHaximus May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed 👍


install:
# OSX install inspired by https://github.com/kiler129/TravisCI-OSX-PHP
- |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
brew tap homebrew/homebrew-php
echo "Installing PHP ..."
brew install "${PACKAGE}"
brew install "${PACKAGE}"-xdebug
brew link "${PACKAGE}"
echo "Installing composer ..."
curl -s http://getcomposer.org/installer | php
mv composer.phar /usr/local/bin/composer
fi
- composer install --no-interaction

script:
Expand Down