hg: jdk7u/jdk7u-dev/jdk: 2 new changesets

[chris.hegarty at oracle.com]

Changeset: 3ff34a436d61
Author:    chegar
Date:      2014-04-23 13:19 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/3ff34a436d61

8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server
Reviewed-by: chegar
Contributed-by: Steven Lawrance <slawrance at salesforce.com>, Andreas Rieber <rieberandreas at gmail.com>

! src/share/classes/sun/net/www/http/HttpClient.java
+ test/sun/net/www/http/HttpClient/B8025710.java

Changeset: 1ab843bd7e4d
Author:    chegar
Date:      2014-04-28 13:39 +0100
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/1ab843bd7e4d

8041931: test/sun/net/www/http/HttpClient/B8025710.java fails with cannot find keystore
Reviewed-by: xuelei

! test/sun/net/www/http/HttpClient/B8025710.java