Use backport of URI module even on ruby 1.9.2-p320 #407

Merged
merged 2 commits into from Jul 15, 2012

Conversation

Projects
None yet
3 participants
Contributor

dayflower commented Jul 13, 2012

I do not know the reason, but MRI's bundled module uri/common still uses inproper regexp even on ruby 1.9.2-p320. So I have made change to use backport module on 1.9.2-p320 (and p318).
Also I've added missing dependency on timeout for test/spec_utils.rb. It will fix test failure on several platforms (ex. 1.9.3, 1.8.7, jruby) I believe.

This pull request passes (merged f496e9b into edc8b92).

Member

tenderlove commented Jul 15, 2012

I'm merging this since the implementation matches trunk ruby. Presumably this isn't going to ever be backport to 1.9.2, so maybe we should stop doing the patchlevel checking before pulling in the backport.

tenderlove added a commit that referenced this pull request Jul 15, 2012

Merge pull request #407 from dayflower/spec_utils
Use backport of URI module even on ruby 1.9.2-p320

@tenderlove tenderlove merged commit e4172e7 into rack:master Jul 15, 2012

@dayflower dayflower deleted the dayflower:spec_utils branch Apr 16, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment