ruby-changes:25492
From: usa <ko1@a...>
Date: Thu, 8 Nov 2012 14:05:57 +0900 (JST)
Subject: [ruby-changes:25492] usa:r37549 (ruby_1_9_3): merge revision(s) 37322: [Backport #7143]
usa 2012-11-08 14:05:45 +0900 (Thu, 08 Nov 2012) New Revision: 37549 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37549 Log: merge revision(s) 37322: [Backport #7143] * win32/win32.c (has_redirection): should use shell (cmd.exe) when the commandline containts '&'. reported by Roger Pack at [ruby-core:47912] [Bug #7143], and patched by Heesob Park at [ruby-core:47931]. Modified directories: branches/ruby_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/version.h branches/ruby_1_9_3/win32/win32.c Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 37548) +++ ruby_1_9_3/ChangeLog (revision 37549) @@ -1,3 +1,10 @@ +Thu Nov 8 14:05:31 2012 NAKAMURA Usaku <usa@r...> + + * win32/win32.c (has_redirection): should use shell (cmd.exe) when + the commandline containts '&'. + reported by Roger Pack at [ruby-core:47912] [Bug #7143], and + patched by Heesob Park at [ruby-core:47931]. + Fri Oct 26 17:22:18 2012 NAKAMURA Usaku <usa@r...> * file.c (append_fspath): need to set the encoding to result always. Index: ruby_1_9_3/win32/win32.c =================================================================== --- ruby_1_9_3/win32/win32.c (revision 37548) +++ ruby_1_9_3/win32/win32.c (revision 37549) @@ -1375,6 +1375,7 @@ case '>': case '<': case '|': + case '&': case '\n': if (!quote) return TRUE; Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 37548) +++ ruby_1_9_3/version.h (revision 37549) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 305 +#define RUBY_PATCHLEVEL 306 #define RUBY_RELEASE_DATE "2012-11-08" #define RUBY_RELEASE_YEAR 2012 Property changes on: ruby_1_9_3 ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk:r37322 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/