2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fdb9980dbd..e540a87f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 12 18:44:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): should match exactly.
+	  [ruby-core:71460] [Bug #11679]
+
 Thu Nov 12 16:16:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* template/prelude.c.tmpl: enable tail call optimization.
diff --git a/parse.y b/parse.y
index 56e424359c..8b26b83da1 100644
--- a/parse.y
+++ b/parse.y
@@ -7088,7 +7088,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, long len)
 	    if (s[i] == '-') s[i] = '_';
 	}
 	do {
-	    if (STRNCASECMP(p->name, s, n) == 0) {
+	    if (STRNCASECMP(p->name, s, n) == 0 && !p->name[n]) {
 		n = vend - vbeg;
 		if (p->length) {
 		    n = (*p->length)(parser, vbeg, n);