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: 68bc5cb4c450
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: 79af044caa5b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 25, 2016

  1. Always return a Fixnum here. openssl defaults to 300.

    @headius
    headius committed Jan 25, 2016
    Copy the full SHA
    aefb6c3 View commit details

  2. Rev pom version.

    @headius
    headius committed Jan 25, 2016
    Copy the full SHA
    79af044 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 pom.xml
  2. +2 −1 src/main/java/org/jruby/ext/openssl/SSLSession.java
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.14</version>
<version>0.9.15-SNAPSHOT</version>
<packaging>gem</packaging>
<name>JRuby OpenSSL</name>
<description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
3 changes: 2 additions & 1 deletion src/main/java/org/jruby/ext/openssl/SSLSession.java
View file
Original file line number Diff line number Diff line change
@@ -134,7 +134,8 @@ public IRubyObject set_time(final ThreadContext context, IRubyObject time) {
@JRubyMethod(name = "timeout")
public IRubyObject timeout(final ThreadContext context) {
final SSLSessionContext sessionContext = sslSession().getSessionContext();
if ( sessionContext == null ) return context.nil;
// default in OpenSSL is 300
if ( sessionContext == null ) return context.runtime.newFixnum(300);
return context.runtime.newFixnum(sessionContext.getSessionTimeout());
}