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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b7db15b01940
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27e80e3d254f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 28, 2016

  1. Set universal newlines earlier to match O_TEXT behavior. 

    Fixes #3762.
    @headius
    headius committed Mar 28, 2016
    Copy the full SHA
    b73e950 View commit details

  2. Untag spec fixed by fix for #3762.

    @headius
    headius committed Mar 28, 2016
    Copy the full SHA
    27e80e3 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/io/EncodingUtils.java
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
import java.util.Arrays;

public class EncodingUtils {
public static final int ECONV_DEFAULT_NEWLINE_DECORATOR = Platform.IS_WINDOWS ? EConvFlags.CRLF_NEWLINE_DECORATOR : 0;
public static final int ECONV_DEFAULT_NEWLINE_DECORATOR = Platform.IS_WINDOWS ? EConvFlags.UNIVERSAL_NEWLINE_DECORATOR : 0;
public static final int DEFAULT_TEXTMODE = Platform.IS_WINDOWS ? OpenFile.TEXTMODE : 0;
public static final int TEXTMODE_NEWLINE_DECORATOR_ON_WRITE = Platform.IS_WINDOWS ? EConvFlags.CRLF_NEWLINE_DECORATOR : 0;

4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/util/io/OpenFile.java
View file
Original file line number Diff line number Diff line change
@@ -920,10 +920,6 @@ public void makeReadConversion(ThreadContext context, int size) {
IRubyObject ecopts;
byte[] sname, dname;
ecflags = encs.ecflags & ~EConvFlags.NEWLINE_DECORATOR_WRITE_MASK;
if (isTextMode() && Platform.IS_WINDOWS) {
// we can't do O_TEXT so we always do CRLF translation on Windows
ecflags = ecflags | EConvFlags.UNIVERSAL_NEWLINE_DECORATOR;
}
ecopts = encs.ecopts;
if (encs.enc2 != null) {
sname = encs.enc2.getName();
1 change: 0 additions & 1 deletion spec/tags/ruby/core/argf/binmode_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
windows(JRUBY-4520):ARGF.binmode puts alls subsequent stream reading through ARGF into binmode
fails:ARGF.binmode sets the file's encoding to ASCII-8BIT