hg: jdk7/tl/jdk: 2 new changesets

[michael.x.mcmahon at oracle.com]

Changeset: aeaadac45240
Author:    michaelm
Date:      2010-12-07 13:27 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/aeaadac45240

7005016: sqe test jhttp/HttpServer150013/HttpServer150013.java
Reviewed-by: chegar

! src/share/classes/sun/net/httpserver/Request.java
! src/share/classes/sun/net/httpserver/SSLStreams.java
! src/share/classes/sun/net/httpserver/ServerConfig.java
+ test/com/sun/net/httpserver/Test10.java

Changeset: 9e173410b4d5
Author:    michaelm
Date:      2010-12-07 13:29 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/9e173410b4d5

Merge

- src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/JarFileSystemProvider.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipConstants.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipDirectoryStream.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributeView.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributes.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileStore.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystem.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystemProvider.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipInfo.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipPath.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipUtils.java