Skip to content

Commit

Permalink
Use CRLF newline conversion instead of universal. Fixes #5100.
Browse files Browse the repository at this point in the history
See ruby/ruby@f9a6a1dd0c6 for the change in CRuby. The remaining
plumbing in this commit needs to be reviewed.
  • Loading branch information
headius committed Apr 16, 2018
1 parent 3c691ec commit 9549f5d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/io/EncodingUtils.java
Expand Up @@ -57,7 +57,7 @@
import java.util.List;

public class EncodingUtils {
public static final int ECONV_DEFAULT_NEWLINE_DECORATOR = Platform.IS_WINDOWS ? EConvFlags.UNIVERSAL_NEWLINE_DECORATOR : 0;
public static final int ECONV_DEFAULT_NEWLINE_DECORATOR = Platform.IS_WINDOWS ? EConvFlags.CRLF_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;

Expand Down

0 comments on commit 9549f5d

Please sign in to comment.