[HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
[DependencyInjection] fixed wrong exception class
merged branch fabpot/inactive-scope-fix (PR #7696)

This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] fixed wrong exception class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

22bf965 [DependencyInjection] fixed wrong exception class
Merge branch '2.1' into 2.2

* 2.1:
  [DependencyInjection] fixed wrong exception class

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
fix a DI circular reference recognition bug
merged branch tgabi333/2.1 (PR #7699)

This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] Fix a DI circular reference recognition bug

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets |
| License       | MIT
| Doc PR        |

plus add ability to detect deeper circular references eg: A -> B -> C -> B

Commits
-------

8a434ed fix a DI circular reference recognition bug
fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator
merged branch 77web/validator-translation-ja-2.2plus (PR #7718)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7718).

Discussion
----------

[2.2+][Validator][translation] update Japanese translation for Validator component

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

Commits
-------

4ea64cd [Validator][translation][japanese] fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator
[Translator] added additional conversion for encodings other than utf-8
merged branch benjaminpaap/bugfixes/xliff_encoding (PR #7698)

This PR was squashed before being merged into the 2.1 branch (closes #7698).

Discussion
----------

[Translator] added additional conversion for encodings other than utf-8

Added an additional conversion if there is another encoding in the
xlf file present. Values from simple_xml are always utf-8 encoded.
Also added some tests to verify this new behaviour.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

54bcf5c [Translator] added additional conversion for encodings other than utf-8
[Translation] removed unneeded getter/setter
[Translation] removed an uneeded class property
merged branch bendavies/iis-rewrite-subrequests (PR #7606)

This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] fixes creation of sub requests under IIS & Rewite Module

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6936, #6923
| License       | MIT
| Doc PR        | N/A

There are a few bugs to address.

1. `HTTP_X_ORIGINAL_URL` wasn't removed from the server parameters, so is picked back up [here](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/ServerBag.php#L33) upon recreation of a sub request.
2. When `X_ORIGINAL_URL` is passed in the headers by IIS, `IIS_WasUrlRewritten` and `UNENCODED_URL` can also be passed as server vars, so they must also be removed for sub request URI's to be resolved correctly.

Additionally, I have removed the OS check for windows, because it was only done for 2 out of 4 of the IIS specific checks, and it made the code untestable.

Also added tests for all scenarios as there were none.

Commits
-------

9fcd2f6 [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
[2.2] Pass ESI header to subrequests
merged branch mweimerskirch/patch-13 (PR #7253)

This PR was squashed before being merged into the 2.2 branch (closes #7253).

Discussion
----------

[2.2] Pass ESI header to subrequests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7252
| License       | MIT

Commits
-------

af819a7 [2.2] Pass ESI header to subrequests
fixed detection of secure cookies received over https

BrowserKit's cookie handling only recognises a secure cookie if the
cookie option is set and the cookie was set over an https request.
The client was not passing the url into the cookiejar update code,
causing Cookie::isSecure() to always return false for every cookie.

Fixes symfony/symfony#7666
[HttpFoundation] fixed empty domain= in Cookie::__toString()
[BrowserKit] removed dead code
[HttpFoundation][BrowserKit] fixed path when converting a cookie to a string

An empty path has a different meaning than a /; it means that the path
is the one from the current URI.
merged branch fabpot/cookie (PR #7738)

This PR was merged into the 2.1 branch.

Discussion
----------

[BrowserKit] fixed detection of secure cookies received over https

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7666, #7738
| License       | MIT
| Doc PR        | N/A

As reported in symfony/symfony#7666, BrowserKit's cookie handling only recognises a secure cookie if the cookie option is set and the cookie was set over an https request. The client was not passing the url into the cookiejar update code, causing Cookie::isSecure() to always return false for every cookie.

I have corrected this behaviour and added an additional unit test to prove the bug and fix.

Commits
-------

36d057b [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
c884151 [BrowserKit] removed dead code
495d0e3 [HttpFoundation] fixed empty domain= in Cookie::__toString()
c2bc707 fixed detection of secure cookies received over https