Mercurial > hg > release > icedtea6-1.11
view patches/openjdk/8010213-set_socketoptions_windows.patch @ 2912:d59bbf7333e0
Backport additional fixes.
Additional fixes were applied to jdk7u as part of the security release.
This patch includes a subset of them.
2013-07-01 Omair Majid <omajid@redhat.com>
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch,
* patches/openjdk/8009217-fix_test_compile.patch,
* patches/openjdk/8009463-space_and_final_backslash.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_regresssion.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011992-MlibOpsTest_failed.patch,
* patches/openjdk/8012112-MlibOpsTest_fails.patch,
* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
* patches/openjdk/8012933-appcontext_disposed_too_early.patch,
* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014427-raster_regresssion.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch: New file.
Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* patches/ecj/override.patch: Add new hunk for BufferedImage.
* NEWS: Update with backports.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Mon, 01 Jul 2013 21:05:04 -0400 |
parents | |
children |
line wrap: on
line source
# 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;