Permalink
Switch branches/tags
Commits on Dec 11, 2012
  1. Add missing shared openssl.rb

    headius committed Dec 11, 2012
  2. Move jruby-openssl out of jruby.jar.

    headius committed Dec 11, 2012
    For JRuby 1.7.0 and 1.7.1, we shipped all of jruby-openssl and the
    Bouncy Castle dependency inside jruby.jar. This worked as an all-
    in-one setup, but failed in other ways:
    
    * With the jossl code in jruby.jar, it is impossible to update it
    using a gem
    
    * With BC code in jruby.jar, it is both impossible to update and
    it fails to work for scenarios that require signed security
    provider jars.
    
    The new setup builds jopenssl.jar into lib/ruby/shared, copies the
    bc*.jar files to lib/ruby/shared, and incorporates the
    bouncy-castle-java.rb file from the bouncy-castle-java gem. This
    allows jruby-openssl to be shipped with JRuby, outside jruby.jar
    to avoid those issues, and upgradable by jruby-openssl gem.
    
    We probably need to adjust dist logic for this. I'll coordinate
    with enebo.
Commits on Dec 10, 2012
  1. Merge pull request #436 from ConradIrwin/bug/get_screen_size

    BanzaiMan committed Dec 10, 2012
    Fix Readline.get_screen_size before Readline.readline
    
    Thanks!
Commits on Dec 9, 2012
  1. Merge pull request #434 from atambo/master

    BanzaiMan committed Dec 9, 2012
    Update psych to ruby/psych@d5757ea
    
    OK. Let's give this a whirl. We'll discuss the future release process soon.
  2. Tag specs failing in CI.

    BanzaiMan committed Dec 9, 2012
  3. At some point, 1.8 also got the support for '%-d'

    BanzaiMan committed Dec 9, 2012
    where '-' means "drop the leading zero".
    
    Fixes #433.
Commits on Dec 7, 2012
  1. Reduce amount of stat calls during load/require searching.

    headius committed Dec 7, 2012
    For every combination of load path + filename + extension, we were
    using Java's File.isFile() to determine whether the file existed.
    We then subsequently also called canRead() to know if we could
    read the file. On a hunch, I modified the check to do *just* the
    canRead call, which should return false if the file in question
    does not exist, is not a file, or is not readable.
    
    The original logic made at least a stat call every time, mostly
    for paths that failed the test. The new logic calls access(2) (at
    least on BSD/Darwin) which might be cheaper (at least the call
    signature does not require allocating a stat-like struct; it is
    not clear whether it might do the same thing as stat internally).
    
    Before the change, here's dtruss counts of system calls for
    bench_load_path 100:
    
    access                                       5588
    dup2                                         5677
    close                                        5724
    open                                         5733
    fstat64                                      5862
    psynch_cvsignal                              6319
    psynch_cvwait                                7998
    fcntl                                       11410
    lseek                                       12439
    read                                        18006
    stat64                                    1163895
    
    And here's the same run after the change:
    
    close                                        5760
    open                                         5771
    fstat64                                      5907
    psynch_cvsignal                              7718
    psynch_cvwait                                9326
    fcntl                                       11486
    stat64                                      11901
    lseek                                       15162
    read                                        20756
    access                                    1163043
  2. Revert "Setup .gitattributes for eol normalization"

    BanzaiMan committed Dec 7, 2012
    This commit is overly eager on fixing the existing files' EOLs.
    I also have reservations about enforcing EOL rules, and would like to
    discuss it a little further.
    
    This reverts commit b111911.
  3. Merge pull request #429 from ryenus/norm-eol

    headius committed Dec 7, 2012
    Setup .gitattributes for eol normalization
  4. Merge pull request #431 from bkabrda/patch-1

    headius committed Dec 7, 2012
    Include runtime version in site dir
  5. Include runtime version in site dir

    bkabrda committed Dec 7, 2012
    I forgot this during doing the path rework, I think it's not used by anyone except me for Fedora packaging, so it can safely be merged into 1.7 tree.
Commits on Dec 6, 2012
  1. Invokedynamic guard improvements for normal invocations.

    headius committed Dec 6, 2012
    * Immediates (Symbol, Fixnum, Float, nil, true, false) do not need metaclass check; instanceof is enough.
    * GWT tests can be simplified to a single permute + insert args.
  2. Setup .gitattributes for eol normalization

    ryenus committed Dec 6, 2012
    This will work automatically for future commits.
    
    For existing files, we have to manually normalize
    them once and only once, with following command:
    
    find . \( -path './.git' -o -path './build*' -o \
    -path './src_gen' \) -prune -o -type f -print |\
    xargs dos2unix
    
    One caveat of dos2unix is, even though it claims
    by default only convert line breaks and skip
    binary files, it actually depends, e.g., some
    UTF-16 files could be messed up; and the BOM in
    some UTF-8 files could be removed unexpectedly.
    
    Therefore, after running the above command, make
    sure to use git diff to see if there's any such
    kind of unexpected change, and those files can be
    restored via git checkout.
  3. As ugly as it might be, maintaining a map of exceptional time zone

    BanzaiMan committed Dec 6, 2012
    values may be the best way to address #215.
  4. No need to look up TZ here. In all cases leading up to here,

    BanzaiMan committed Dec 6, 2012
    we should rely on the String value passed to set up the Time object.
Commits on Dec 5, 2012
  1. Merge pull request #428 from prathamesh-sonpatki/graph_librabry_tests

    enebo committed Dec 5, 2012
    Directed graph library specs
  2. [IR JIT] More work to prepare a IR scope for compilation.

    subbuss committed Dec 5, 2012
    * updated ir-scope flags to check if a scope can receive
      breaks or non-local returns
    * added stubs to generate exception handling code for IRBreakJump
      and IRReturnJump.
  3. OpenSSL::HMAC transcodes data to iso-8895-1 before signing

    headius committed Dec 5, 2012
    JRUBY-7017 patch by Brian Gugliemetti. Thank you!
Commits on Dec 4, 2012