From 5dc7a282f75522a982f62ae360f167c68c04ed98 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 9 Nov 2015 16:10:21 +0400
Subject: [PATCH 1/3] fix switching between php and js debuggers

---
 package.json           | 2 +-
 plugins/c9.core/ext.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5c95464f..36824708 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.find": "#35379124ca",
         "c9.ide.find.infiles": "#c132ad243c",
         "c9.ide.find.replace": "#44772dd796",
-        "c9.ide.run.debug": "#1415524d85",
+        "c9.ide.run.debug": "#f03d4fb509",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js
index 29369049..e6c71bf4 100644
--- a/plugins/c9.core/ext.js
+++ b/plugins/c9.core/ext.js
@@ -530,7 +530,7 @@ define(function(require, exports, module) {
                 });
             }
             
-            function cleanUp(what) {
+            function cleanUp(what, otherPlugin) {
                 if (!what || ~what.indexOf("elements")) {
                     // Loop through elements
                     elements.forEach(function(element) {
@@ -546,6 +546,7 @@ define(function(require, exports, module) {
                     events.forEach(function(eventRecord) {
                         var event = eventRegistry[eventRecord[0]];
                         if (!event) return; // this happens with mock plugins during testing
+                        if (otherPlugin && otherPlugin.name != event.name) return;
                         var type = eventRecord[1];
                         var id = eventRecord[2];
                         var _events = event._events;

From c28fa02f82e4addc290f33ee84a4633bbb767921 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 9 Nov 2015 16:11:04 +0400
Subject: [PATCH 2/3] add monitor handler for php address in use message

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 36824708..710f753e 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#76cf52ab6d",
         "c9.ide.scm": "#f0365ca725",
-        "c9.ide.terminal.monitor": "#b76f1c9f24",
+        "c9.ide.terminal.monitor": "#35afa7f97f",
         "c9.ide.test": "#4913e6a0b9",
         "c9.ide.test.mocha": "#586fb0cdc2",
         "c9.ide.theme.flat": "#2de8414db7",

From 95f594bbaed1e9523fd5df3cc2ff814597b7f587 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 9 Nov 2015 16:13:25 +0400
Subject: [PATCH 3/3] fix reconnect logic for php debugger

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 710f753e..e5350aa8 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.find": "#35379124ca",
         "c9.ide.find.infiles": "#c132ad243c",
         "c9.ide.find.replace": "#44772dd796",
-        "c9.ide.run.debug": "#f03d4fb509",
+        "c9.ide.run.debug": "#dbe6c81252",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
@@ -102,9 +102,9 @@
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#f9b7d60b96",
+        "c9.ide.run": "#2932a2c625",
         "c9.ide.run.build": "#0598fff697",
-        "c9.ide.run.debug.xdebug": "#61dcbd0180",
+        "c9.ide.run.debug.xdebug": "#891f40a245",
         "c9.ide.save": "#76cf52ab6d",
         "c9.ide.scm": "#f0365ca725",
         "c9.ide.terminal.monitor": "#35afa7f97f",