Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b4bc77f678f
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9b5af05a3ae
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 15, 2015

  1. Force US locale for date formatting

    Otherwise it uses system locale, which is inconsistent with MRI.
    dividedmind committed Sep 15, 2015
    Copy the full SHA
    102c17d View commit details

Commits on Sep 16, 2015

  1. Merge pull request #72 from dividedmind/force-us-locale

    Force US locale for date formatting
    kares committed Sep 16, 2015
    Copy the full SHA
    c9b5af0 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/main/java/org/jruby/ext/openssl/StringHelper.java
2 changes: 2 additions & 0 deletions src/main/java/org/jruby/ext/openssl/StringHelper.java
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Locale;

import org.jcodings.specific.UTF8Encoding;
import org.joda.time.DateTime;
@@ -132,6 +133,7 @@ static void gsub(final Ruby runtime, final ByteList str, final byte match, final

private static final DateTimeFormatter ASN_DATE_NO_ZONE =
DateTimeFormat.forPattern("MMM dd HH:mm:ss yyyy") // + " zzz"
.withLocale(Locale.US)
.withZone(DateTimeZone.UTC);

static StringBuilder appendGMTDateTime(final StringBuilder text, final DateTime time) {