commit 54c9bd54949f75f7486dff9e24443e4cbaf90ba3
author Yi Kong <yikong@google.com> Thu Jan 19 11:28:29 2017 +0100
committer gitbuildkicker <android-build@google.com> Mon Feb 27 11:31:45 2017 -0800
tree c1d8128ea87343558ae31180c33cd25f7f512394
parent c55ce33096e893e1f44bf7714ae72f471b5f5d95

Pull upstream fix for CVE-2016-5552

to replace our local change that is essentially equivalent logic.

The upstream fix additionally fixes a flaw which if there is more
than one @ in the authority portion, then user and host are set to null
(ignored as malformed).

Upstream change:
  Merge

  http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/1e8c18ddcab1

Test: libcore.java.net.URLTest#testMultipleUserField
Test: CtsLibcoreTestCases
Bug: 33351987
Change-Id: If5ab229f951c872aecb34834f0a52153f3f0fa26
(cherry picked from commit 2e3689a5019e781fb361cc67982926beaaa969c2)
(cherry picked from commit 7247f6a70e89efb4696aaaffaf7a0325604a6e06)