Skip to content

Address httpoxy vulnerability #31

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 13 commits into from
Jul 25, 2016
Merged

Address httpoxy vulnerability #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b2e675
Update Guzzle, change http client cache
Jul 22, 2016
c967b31
wip
Jul 22, 2016
4ad38ed
FeatureRequester works with Guzzle 6, but no caching yet
Jul 23, 2016
1f35760
[wip] add cache
Jul 23, 2016
826a5fa
New http client caching works.
Jul 23, 2016
a15a47d
remove dev version
Jul 23, 2016
8912139
Update version
Jul 23, 2016
10a60c8
Update version in other place
Jul 23, 2016
428e36c
maybe a no-op.
Jul 23, 2016
1f34437
make guzzle required
Jul 23, 2016
132453a
Make guzzle optional. Update README.
Jul 23, 2016
5cfbc9c
Add dev requirements
Jul 23, 2016
a903193
composer update
Jul 23, 2016
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Quick setup
0. Install the PHP SDK with [Composer](https://getcomposer.org/)

php composer.phar require launchdarkly/launchdarkly-php
php composer.phar require "guzzlehttp/guzzle:5.*"
php composer.phar require "guzzlehttp/cache-subscriber:0.1.*"
php composer.phar require "guzzlehttp/guzzle:6.2.1"
php composer.phar require "kevinrob/guzzle-cache-middleware": "1.4.1"

1. After installing, require Composer's autoloader:

Expand Down Expand Up @@ -49,8 +49,8 @@ Using Guzzle

To use Guzzle it must be required as a dependency:

php composer.phar require "guzzlehttp/guzzle:5.*"
php composer.phar require "guzzlehttp/cache-subscriber:0.1.*"
php composer.phar require "guzzlehttp/guzzle:6.2.1"
php composer.phar require "kevinrob/guzzle-cache-middleware": "1.4.1"

It will then be used as the default way of fetching flags.

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.0
1.0.0
Copy link
Contributor Author

@drichelson drichelson Jul 23, 2016

Choose a reason for hiding this comment

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

Do we want to stick with the pre-1.0 versions? if so this should be 0.8.0

Copy link
Contributor

@pkaeding pkaeding Jul 24, 2016

Choose a reason for hiding this comment

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

We should definitely bump the major version if this is an API-breaking change.

Copy link
Contributor Author

@drichelson drichelson Jul 24, 2016

Choose a reason for hiding this comment

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

I'm fine either way, but FYI: http://semver.org/#spec-item-4

10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
"php": ">=5.5"
},
"require-dev": {
"guzzlehttp/guzzle": "6.2.1",
"kevinrob/guzzle-cache-middleware": "1.4.1",
"phpunit/phpunit": "4.8.26",
"phpdocumentor/phpdocumentor": "2.*",
"predis/predis": "1.0.*",
Copy link
Contributor Author

@drichelson drichelson Jul 23, 2016

Choose a reason for hiding this comment

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

This goes away because it is not compatible with Guzzle 6: https://github.com/guzzle/cache-subscriber

"guzzlehttp/guzzle": "5.*",
"guzzlehttp/cache-subscriber": "0.1.*",
"zendframework/zend-serializer": "2.7.*"
},
"suggested": {
"predis/predis": "1.0.*",
"guzzlehttp/guzzle": "5.*",
"guzzlehttp/cache-subscriber": "0.1.*"
"guzzlehttp/guzzle": "6.2.1",
"kevinrob/guzzle-cache-middleware": "1.4.1",
"predis/predis": "1.0.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading