[ruby-cvs:57817] usa:r50669 (ruby_2_1): merge revision(s) 49618, 49640: [Backport #10858]

usa at ruby-lang.org usa at ruby-lang.org
Fri May 29 14:01:05 JST 2015


usa	2015-05-29 14:01:04 +0900 (Fri, 29 May 2015)

  New Revision: 50669

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50669

  Log:
    merge revision(s) 49618,49640: [Backport #10858]
    
    * win32/file.c (rb_file_expand_path_internal): do not make invalid
      (or ADS) path if the path has a drive letter, the result also
      should have be under it.  [ruby-core:68130] [Bug #10858]
    
    * win32/file.c (rb_file_expand_path_internal): neither the drive
      of base directory nor the current drive are involved in the
      result if different than the drive of path.
      [ruby-core:68130] [Bug #10858]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_file_exhaustive.rb
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/file.c


More information about the ruby-cvs mailing list