Skip to content

Commit f1f567c

Browse files
committed
Prepare for 2.4.1
1 parent 5f4318d commit f1f567c

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
CHANGELOG
22
=========
33

4-
2.4.1 (2016-XX-XX)
4+
2.4.1 (2016-06-10)
55
------------------
66

77
* Corrected type annotations in documentation. GitHub #66.
88
* Updated documentation to reflect that the accuracy radius is now included
99
in City.
10+
* Upgraded web service client, which supports setting a proxy. GitHub #59.
1011

1112
2.4.0 (2016-04-15)
1213
------------------

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"require": {
1616
"maxmind-db/reader": "~1.0",
17-
"maxmind/web-service-common": "~0.1",
17+
"maxmind/web-service-common": "~0.2",
1818
"php": ">=5.3.1"
1919
},
2020
"require-dev": {

tests/GeoIp2/Test/WebService/ClientTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ private function makeRequest(
465465
? $options['connectTimeout'] : null,
466466
'timeout' => isset($options['timeout'])
467467
? $options['timeout'] : null,
468+
'proxy' => isset($options['proxy'])
469+
? $options['proxy'] : null,
468470
'caBundle' => $caBundle,
469471
)
470472
)

0 commit comments

Comments
 (0)