diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 06:55:00 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 06:55:00 +0000 |
| commit | e6a5f817d613dbd40cf2d19cd0705a1b4c377538 (patch) | |
| tree | 0e38c2d393104777c836c80036c0e9945098fb09 /win32 | |
| parent | dd7f1cdfbd8215ee46c11175bfd2f4fd3569f34a (diff) | |
merge revision(s) 48534: [Backport #10412]
* lib/resolv.rb: fall back if canonicalization fails.
Thanks Vit Ondruch for the patch! [ruby-core:65836]
* test/resolv/test_dns.rb: test for patch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index f85d4ec9d1..a7cbbbb377 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1399,6 +1399,8 @@ insert(const char *path, VALUE vinfo, void *enc) return 0; } +/* License: RubArtistic or GPL */ + /* License: Artistic or GPL */ static NtCmdLineElement ** cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail) |