Mercurial > hg > release > icedtea6-1.13

changeset 3166:04c718dce7b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop upstreamed patch. 2014-07-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/8010213-set_socketoptions_windows.patch: Remove upstreamed patch. * Makefile.am: (ICEDTEA_PATCHES): Drop upstreamed patch.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Wed, 30 Jul 2014 16:17:30 +0100
parents 436ae6447fa2
children 34ab3ceed7cb
files ChangeLog Makefile.am patches/openjdk/8010213-set_socketoptions_windows.patch
diffstat 3 files changed, 7 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 08 17:23:59 2014 +0100
+++ b/ChangeLog	Wed Jul 30 16:17:30 2014 +0100
@@ -1,3 +1,10 @@
+2014-07-30  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/openjdk/8010213-set_socketoptions_windows.patch:
+	Remove upstreamed patch.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Drop upstreamed patch.
+
 2014-07-30  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Oct 08 17:23:59 2014 +0100
+++ b/Makefile.am	Wed Jul 30 16:17:30 2014 +0100
@@ -496,7 +496,6 @@
 	patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
 	patches/openjdk/8009217-fix_test_compile.patch \
 	patches/openjdk/8009610-blacklist_malware_certificate.patch \
-	patches/openjdk/8010213-set_socketoptions_windows.patch \
 	patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
 	patches/openjdk/8011154-awt_regression.patch \
 	patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \
--- a/patches/openjdk/8010213-set_socketoptions_windows.patch	Wed Oct 08 17:23:59 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User khazra
-# Date 1363811996 25200
-# Node ID 7750666eaf166e523bf2bea826ef6ef1056ea252
-# Parent  05e5519ffbccc0a6cce2d7cffcd74778aba1378e
-8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
-Summary: Eliminate fall-through while setting socket options on Windows
-Reviewed-by: alanb, chegar
-
---- openjdk/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
-+++ openjdk/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
-@@ -184,14 +184,15 @@
-         int optionValue = 0;
- 
-         switch(opt) {
--            case TCP_NODELAY :
--            case SO_OOBINLINE :
-             case SO_REUSEADDR :
-                 if (exclusiveBind) {
-                     // SO_REUSEADDR emulated when using exclusive bind
-                     isReuseAddress = on;
-                     return;
-                 }
-+                // intentional fallthrough
-+            case TCP_NODELAY :
-+            case SO_OOBINLINE :
-             case SO_KEEPALIVE :
-                 optionValue = on ? 1 : 0;
-                 break;