Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'releases/2.4.2' into develop
Browse files Browse the repository at this point in the history
2.4.2 readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php
  • Loading branch information
weierophinney committed May 11, 2015
2 parents 7eb0eeb + 163a511 commit 8536480
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# CHANGELOG

## 2.4.2 (2015-05-11)

- [7503: Mail header - boundary issue (related to ZF2015-04)](https://github.com/zendframework/zf2/issues/7503)
- [7506: [mail\ Fix set UTF-8 values to headers. Fix #7501](https://github.com/zendframework/zf2/pull/7506)
- [7507: [http\ Allow serialize any character on cookies](https://github.com/zendframework/zf2/pull/7507)
- [7510: [mail/mime\ Fix content-type has invalid characters in field value. Fix #7503](https://github.com/zendframework/zf2/pull/7510)
- [7512: \Zend\Ldap\Attribute::valueFromLdap catching wrong exception](https://github.com/zendframework/zf2/issues/7512)
- [7513: [ldap\ Fix exceptions while parsing are not captured.](https://github.com/zendframework/zf2/pull/7513)
- [7514: [#7503\ Pass the `\r\n` sequence to Part::getHeadersAsArray()](https://github.com/zendframework/zf2/pull/7514)

## 2.4.1 (2015-05-07)

- [7361: Missing parameter annotation in PHPDoc in Zend\Http\PhpEnvironment\Request](https://github.com/zendframework/zf2/pull/7361)
Expand Down Expand Up @@ -380,6 +390,12 @@
- [7374: Adjust ContentType regex to allow quoted strings and equals](https://github.com/zendframework/zf2/pull/7374)
- [7375: Correcting](https://github.com/zendframework/zf2/pull/7375)

## 2.3.9 (2015-05-11)

- [#7506](https://github.com/zendframework/zf2/pull/7506) resolves issues when UTF-8 values are used in Mail headers, particularly addresses.
- [#7507](https://github.com/zendframework/zf2/pull/7507) ensures that array values can be used with cookies.
- [#7514](https://github.com/zendframework/zf2/pull/7514) ensures that multipart MIME messages can be added to `Zend\Mail\Message` instances in such a way that they do not conflict with ZF2015-04.

## 2.3.8 (2015-05-07)

### SECURITY UPDATES
Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Http/Header/OriginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function testPreventsCRLFAttackViaFromString()
{
$header = Origin::fromString("Origin: http:https://zend.org\r\n\r\nevilContent");
}

/**
* @group ZF2015-04
*/
Expand Down

0 comments on commit 8536480

Please sign in to comment.