Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Don't load the backport for uri/common.rb when running 1.9.3-p125 and beyond #358

Merged
merged 1 commit into from

2 participants

Stefano Cobianchi Aaron Patterson
Stefano Cobianchi

As explained in #357, the code in backports/uri/common_193 is now present in 1.9.3-p125, so it should be loaded only under 1.9.3-p0.

Aaron Patterson
Owner

I think this is good, but let me verify the patch that was backported to the 1.9.3 release branch before applying this.

Aaron Patterson tenderlove merged commit 8c8e535 into from
Aaron Patterson
Owner

Just so we've got a trail, I backported the URI fixes to the 1.9.3 stable branch here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 5, 2012
  1. Don't load the backport for uri/common.rb when running 1.9.3-p125 and…

    Stefano Cobianchi authored
    … beyond
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/rack/utils.rb
2  lib/rack/utils.rb
View
@@ -10,7 +10,7 @@
require 'rack/backports/uri/common_18'
elsif major == 1 && minor == 9 && patch < 3
require 'rack/backports/uri/common_192'
-elsif major == 1 && minor == 9 && patch == 3
+elsif major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
require 'rack/backports/uri/common_193'
else
require 'uri/common'
Something went wrong with that request. Please try again.