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: be3b962ad569
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae1593a8f1a5
Choose a head ref
8 contributors

Commits on Mar 20, 2015

  1. Add reverse_lookup param to Socket.getaddrinfo. 

    Adding reverse_lookup parameter support to Socket.getaddrinfo.
This parameter was added in Ruby 1.9.
    @kpamidon
    kpamidon committed Mar 20, 2015
    Copy the full SHA
    d0cec55 View commit details

Commits on Apr 24, 2015

  1. Enabling tty for powerpc64 

    Adding ppc64 as supported platform for tty.
    Leonardo Bianconi committed Apr 24, 2015
    Copy the full SHA
    99d6b50 View commit details

Commits on Apr 27, 2015

  1. Private field is not in getMethods.

    @headius
    headius committed Apr 27, 2015
    Copy the full SHA
    c0a2b33 View commit details

Commits on Apr 28, 2015

  1. Update to jnr-posix 3.0.11 for #2424.

    @headius
    headius committed Apr 28, 2015
    Copy the full SHA
    b91a581 View commit details

  2. Tweak fixes for popen that changed sh use given array of strings.

    @headius
    headius committed Apr 28, 2015
    Copy the full SHA
    ca2f5f7 View commit details

  3. Update to RubyGems 2.4.6.

    @headius
    headius committed Apr 28, 2015
    Copy the full SHA
    e3f23d3 View commit details

  4. Mo' pems, mo' bettah.

    @headius
    headius committed Apr 28, 2015
    Copy the full SHA
    43d3006 View commit details

Commits on Apr 29, 2015

  1. extract arg size mismatch check into a private method

    @kares
    kares committed Apr 29, 2015
    Copy the full SHA
    df1d09d View commit details

  2. RubyModule needs toJava to convert interface proxies to Java classes (f… 

    …ixes #2881)
    @kares
    kares committed Apr 29, 2015
    Copy the full SHA
    33453c2 View commit details

  3. make Priority enum's value field final

    @kares
    kares committed Apr 29, 2015
    Copy the full SHA
    af65da8 View commit details

  4. verify that java_send works just fine with package/private class' pub… 

    …lic methods
    @kares
    kares committed Apr 29, 2015
    Copy the full SHA
    48c3e58 View commit details

  5. Merge pull request #2890 from lbianc/ppc64_tty_1_7 

    Enabling tty for powerpc64 (1_7)
    @enebo
    enebo committed Apr 29, 2015
    Copy the full SHA
    5aef1b9 View commit details

Commits on Apr 30, 2015

  1. delete obsolete files - closing #2894

    @mkristian
    mkristian committed Apr 30, 2015
    Copy the full SHA
    5fd659d View commit details

Commits on May 1, 2015

  1. Fixes #2903. Removing event hooks can AIOOB

    @enebo
    enebo committed May 1, 2015
    Copy the full SHA
    74892a4 View commit details

  2. fix GH-2896 on master

    @k77ch7 @enebo
    k77ch7 authored and enebo committed May 1, 2015
    Copy the full SHA
    08c65d4 View commit details

  3. Fixes #2902. Enumerable#find_index gives wrong result in case with ty… 

    …pes cast

Conflicts:
	core/src/main/java/org/jruby/RubyEnumerable.java
    @enebo
    enebo committed May 1, 2015
    Copy the full SHA
    f131465 View commit details

  4. Fixes #2387. 

    absolute paths without drive letter don't work in windows
    @enebo
    enebo committed May 1, 2015
    Copy the full SHA
    cb4e52e View commit details

Commits on May 4, 2015

  1. Bail out of recursively-namespaced modules when calculating name. 

    Fixes #2314.
    @headius
    headius committed May 4, 2015
    Copy the full SHA
    5305b14 View commit details

  2. Use latest snapshots of changing jnr projects.

    @headius
    headius committed May 4, 2015
    Copy the full SHA
    c0ca176 View commit details

  3. Update to latest jnr releases.

    @headius
    headius committed May 4, 2015
    Copy the full SHA
    01e7076 View commit details

  4. [build] make the build maven-3.3.x 

    to overwrite the config of parent plugin the ids need match (before it did over all
executions)
    @mkristian
    mkristian committed May 4, 2015
    Copy the full SHA
    757f249 View commit details

  5. Bump for version

    @enebo
    enebo committed May 4, 2015
    Copy the full SHA
    3086e6a View commit details

Commits on May 5, 2015

  1. Treat bogus IO as opaque dynamic object in case it's borked. 

    Fixes #2373.
    @headius
    headius committed May 5, 2015
    Copy the full SHA
    acc4aa1 View commit details

  2. Bump for next development cycle

    @enebo
    enebo committed May 5, 2015
    Copy the full SHA
    7fea057 View commit details

  3. Handle additional error conditions in Charset transcoder. 

    Java 7 appears to raise different errors for some cases, and these
cases were not handled in the encoder loop. As a result, they
could trigger an infinite loop on bad input. This appeared to be
in the form of cleaved UTF-16 surrogate pairs leading to underflow
where in Java 8 those pairs do not get cleaved.

Fixes #2856.
    @headius
    headius committed May 5, 2015
    Copy the full SHA
    c212568 View commit details

  4. Add regression spec for #2856.

    @headius
    headius committed May 5, 2015
    Copy the full SHA
    b50660e View commit details

Commits on May 6, 2015

  1. Set thread-local call type and visibility around all m_m dispatch. 

    This also simplifies the pre-built "visibility m_m's" and
eliminates a few inner classes.

Fixes #540.
    @headius
    headius committed May 6, 2015
    Copy the full SHA
    2799836 View commit details

Commits on May 7, 2015

  1. Improve shell+cmd checking and inherit stderr from parent. 

    Fixes #1396.
    @headius
    headius committed May 7, 2015
    Copy the full SHA
    0505de3 View commit details

  2. Symbol defines its own #== to avoid #<=> String creation.

    @headius
    headius committed May 7, 2015
    Copy the full SHA
    71a086c View commit details

Commits on May 8, 2015

  1. Merge pull request #2724 from kpamidon/socket_getaddrinfo_reverse_lookup 

    Socket.getaddrinfo reverse_lookup
    @headius
    headius committed May 8, 2015
    Copy the full SHA
    837cb73 View commit details

Commits on May 13, 2015

  1. do not run the spec in 1.8 mode (avoids travis-ci failures due missin… 

    …g Random)
    @kares
    kares committed May 13, 2015
    Copy the full SHA
    3ac859f View commit details

  2. make sure we do not confuse bytes length with end index (due ByteList… 

    … usage)

... also cleanup up the internals a bit
    @kares
    kares committed May 13, 2015
    Copy the full SHA
    72d6e80 View commit details

  3. adjust (inline) removing backslashes and make sure sub index is alway… 

    …s correct!
    @kares
    kares committed May 13, 2015
    Copy the full SHA
    546bc78 View commit details

  4. generix-ize internal iface + rename/move some var declarations

    @kares
    kares committed May 13, 2015
    Copy the full SHA
    eb48185 View commit details

  5. handle exception being thrown when doing a Dir['{}'] (fixes #2922) 

    ... in this case we end up with an empty path in Dir's `glob_helper` and it all seems reasonable - thuse removed the length check comment about "" ending up here
    @kares
    kares committed May 13, 2015
    Copy the full SHA
    0da8bff View commit details

  6. avoid the intermediate ArrayList ... create the Java array directly

    @kares
    kares committed May 13, 2015
    Copy the full SHA
    c81e3eb View commit details

  7. return empty Ruby array for empty dir list

    @kares
    kares committed May 13, 2015
    Copy the full SHA
    5bc6c50 View commit details

Commits on May 15, 2015

  1. tune timeout to work when scheduling or argument convenrsion throws (… 

    …see #2940)
    @kares
    kares committed May 15, 2015
    Copy the full SHA
    1e2d2dd View commit details

  2. missing throw statement in RubyString's concat

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    3514211 View commit details

  3. unnecessary (int) cast

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    57140ca View commit details

  4. generix-ize the environment field (at least internally) + use a Strin… 

    …gBuilder
    @kares
    kares committed May 15, 2015
    Copy the full SHA
    76b6992 View commit details

  5. inner class' Finalizer fields id and finalized can be final

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    139a558 View commit details

  6. add some (internal) generics for an improved readability xp

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    e80996f View commit details

  7. less (int) casting noiz

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    800554b View commit details

  8. further hand drying of the Timeout module impl

    @kares
    kares committed May 15, 2015
    Copy the full SHA
    b9966b5 View commit details

  9. refactor Timeout's scheduled tasks to an inner class (for easier iden… 

    …tification)
    @kares
    kares committed May 15, 2015
    Copy the full SHA
    c591f4f View commit details

Commits on May 19, 2015

  1. [build] switch to 1.7.21-SNAPSHOT for test-jruby-jars

    @mkristian
    mkristian committed May 19, 2015
    Copy the full SHA
    1956dfb View commit details

Commits on May 22, 2015

  1. DateTime.iso8601 fails with an error if a second fraction is present 

    Fixes #2883
    @azolotko @kares
    azolotko authored and kares committed May 22, 2015
    Copy the full SHA
    4e822a1 View commit details

Commits on May 23, 2015

  1. add missing ' ' (space) in exception message ... TypeError from `slee… 

    …p('invalid')`
    @kares
    kares committed May 23, 2015
    Copy the full SHA
    68644e3 View commit details

  2. introduce and use conversion( just like MRI does) on #timeout's sec a… 

    …rgument
    @kares
    kares committed May 23, 2015
    Copy the full SHA
    47ec519 View commit details
Showing with 1,250 additions and 966 deletions.
  1. +1 −1 .gitignore
  2. +5 −5 antlib/extra.xml
  3. +3 −0 core/pom.xml
  4. +1 −1 core/src/main/java/org/jruby/Ruby.java
  5. +149 −148 core/src/main/java/org/jruby/RubyArray.java
  6. +54 −76 core/src/main/java/org/jruby/RubyBasicObject.java
  7. +18 −19 core/src/main/java/org/jruby/RubyDir.java
  8. +144 −141 core/src/main/java/org/jruby/RubyIO.java
  9. +11 −9 core/src/main/java/org/jruby/RubyInstanceConfig.java
  10. +28 −28 core/src/main/java/org/jruby/RubyInteger.java
  11. +64 −63 core/src/main/java/org/jruby/RubyKernel.java
  12. +41 −24 core/src/main/java/org/jruby/RubyModule.java
  13. +3 −4 core/src/main/java/org/jruby/RubyString.java
  14. +101 −68 core/src/main/java/org/jruby/RubyTime.java
  15. +126 −79 core/src/main/java/org/jruby/ext/timeout/Timeout.java
  16. +18 −20 core/src/main/java/org/jruby/java/proxies/JavaProxy.java
  17. +1 −1 core/src/main/java/org/jruby/javasupport/binding/Priority.java
  18. +185 −193 core/src/main/java/org/jruby/util/Dir.java
  19. +21 −17 core/src/main/java/org/jruby/util/ShellLauncher.java
  20. +6 −1 core/src/main/ruby/jruby/kernel/jruby/process_manager.rb
  21. +3 −3 lib/ruby/stdlib/date/format.rb
  22. +1 −1 maven/jruby-complete/pom.rb
  23. +42 −5 spec/java_integration/methods/java_send_spec.rb
  24. +15 −0 spec/regression/GH-2856_bad_character_transcode_should_not_hang_spec.rb
  25. +14 −0 spec/regression/GH-2883_date_sec_fraction_spec.rb
  26. +25 −21 test/jruby/test_dir.rb
  27. +89 −34 test/jruby/test_kernel.rb
  28. +40 −2 test/jruby/test_respond_to.rb
  29. +41 −2 test/jruby/test_timeout.rb
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ lib/ruby/stdlib/jar*
lib/ruby/stdlib/jline
lib/ruby/stdlib/jopenssl*
lib/ruby/stdlib/krypt*
lib/ruby/stdlib/openssl
lib/ruby/stdlib/openssl*
lib/ruby/stdlib/org/
lib/ruby/stdlib/readline/*readline*.jar
lib/ruby/stdlib/ripper.jar
10 changes: 5 additions & 5 deletions antlib/extra.xml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -136,7 +136,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -152,7 +152,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -168,7 +168,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -460,7 +460,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
3 changes: 3 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-enxio</artifactId>
<version>0.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
@@ -101,6 +102,7 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>0.8</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
@@ -116,6 +118,7 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.0.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -1288,7 +1288,7 @@ && getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
// attempt to enable unlimited-strength crypto on OpenJDK
try {
Class jceSecurity = Class.forName("javax.crypto.JceSecurity");
Field isRestricted = jceSecurity.getField("isRestricted");
Field isRestricted = jceSecurity.getDeclaredField("isRestricted");
isRestricted.setAccessible(true);
isRestricted.set(null, false);
isRestricted.setAccessible(false);
Loading