Mercurial > hg > release > icedtea-1.9

view patches/security/icedtea-6630639.patch @ 1768:3a122c249dda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Port latest security fixes from IcedTea6. 2009-04-06 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add new patches. * patches/security/icedtea-6536193.patch, * patches/security/icedtea-6610888.patch, * patches/security/icedtea-6610896.patch, * patches/security/icedtea-6630639.patch, * patches/security/icedtea-6632886.patch, * patches/security/icedtea-6636360.patch, * patches/security/icedtea-6652463.patch, * patches/security/icedtea-6656633.patch, * patches/security/icedtea-6658158.patch, * patches/security/icedtea-6691246.patch, * patches/security/icedtea-6717680.patch, * patches/security/icedtea-6721651.patch, * patches/security/icedtea-6737315.patch, * patches/security/icedtea-6792554.patch, * patches/security/icedtea-6804996.patch, * patches/security/icedtea-6804997.patch, * patches/security/icedtea-6804998.patch: Security patches ported from IcedTea6.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 07 Apr 2009 01:02:17 +0100
parents
children
line wrap: on
line source

diff -Nru openjdk.orig/jdk/src/share/classes/sun/net/httpserver/Request.java openjdk/jdk/src/share/classes/sun/net/httpserver/Request.java
--- openjdk.orig/jdk/src/share/classes/sun/net/httpserver/Request.java	2009-04-06 17:19:49.000000000 +0100
+++ openjdk/jdk/src/share/classes/sun/net/httpserver/Request.java	2009-04-06 17:23:16.000000000 +0100
@@ -52,6 +52,9 @@
         os = rawout;
         do {
             startLine = readLine();
+            if (startLine == null) {
+                return;
+            }
             /* skip blank lines */
         } while (startLine == null ? false : startLine.equals (""));
     }
diff -Nru openjdk.orig/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java openjdk/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java
--- openjdk.orig/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	2009-04-06 17:19:49.000000000 +0100
+++ openjdk/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	2009-04-06 17:23:16.000000000 +0100
@@ -433,6 +433,7 @@
                         rawin = sslStreams.getInputStream();
                         rawout = sslStreams.getOutputStream();
                         engine = sslStreams.getSSLEngine();
+                        connection.sslStreams = sslStreams;
                     } else {
                         rawin = new BufferedInputStream(
                             new Request.ReadStream (
@@ -442,6 +443,8 @@
                             ServerImpl.this, chan
                         );
                     }
+                    connection.raw = rawin;
+                    connection.rawout = rawout;
                 }
                 Request req = new Request (rawin, rawout);
                 requestLine = req.requestLine();