From c58402cde18b956affd34364475549ae67a96da9 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Nov 2012 05:05:45 +0000
Subject: [PATCH] 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].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     | 7 +++++++
 version.h     | 2 +-
 win32/win32.c | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 574f739826..7867194e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov  8 14:05:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* file.c (append_fspath): need to set the encoding to result always.
diff --git a/version.h b/version.h
index 14a0846165..d2f6b39a30 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/win32/win32.c b/win32/win32.c
index 7c2671f43a..fcefe2c6c7 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1375,6 +1375,7 @@ has_redirection(const char *cmd)
 	  case '>':
 	  case '<':
 	  case '|':
+	  case '&':
 	  case '\n':
 	    if (!quote)
 		return TRUE;