X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java index 203a5b4..461bf7b 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java @@ -8,45 +8,67 @@ http://www.eclipse.org/legal/cpl-v10.html Contributors: IBM Corporation - Initial implementation Vicente Fernando - www.alfersoft.com.ar + Christian Perkonig - remote Debug **********************************************************************/ package net.sourceforge.phpdt.internal.launching; import java.util.Iterator; +import net.sourceforge.phpdt.internal.core.JavaProject; +import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy; +import net.sourceforge.phpdt.internal.debug.core.model.PHPDebugTarget; + import org.eclipse.core.resources.IProject; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.IProcess; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import net.sourceforge.phpdt.internal.debug.core.model.PHPDebugTarget; -import net.sourceforge.phpdt.internal.debug.core.Environment; -import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy; -import net.sourceforge.phpeclipse.resourcesview.PHPProject; +//import net.sourceforge.phpeclipse.resourcesview.PHPProject; public class DebuggerRunner extends InterpreterRunner { public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) { String[] env; - PHPDBGProxy newPHPDBGProxy= new PHPDBGProxy(); - newPHPDBGProxy.start(); - env= setEnvironmentVariables(newPHPDBGProxy.getPort(), configuration.getAbsoluteFileName()); - - IProcess process = super.run(configuration, launch, env); + String name, value; + PHPDBGProxy newPHPDBGProxy= new PHPDBGProxy(configuration.useRemoteDebugger(), + configuration.getRemoteSourcePath()); + int pos; + + + IProcess process =null; PHPDebugTarget debugTarget = new PHPDebugTarget(launch, process); - newPHPDBGProxy.setDebugTarget(debugTarget); + newPHPDBGProxy.setDebugTarget(debugTarget); + newPHPDBGProxy.start(); + if (configuration.useRemoteDebugger()) + { + // listener for remote debuger is started + } + else + { + setEnvironmentVariables(configuration,newPHPDBGProxy.getPort()); +// env=configuration.getEnvironment(); + process = super.run(configuration, launch); + debugTarget.setProcess(process); + } launch.addDebugTarget(debugTarget); return process; } - - protected String[] setEnvironmentVariables(int listenPort, String AbsoluteFileName) { - IPath FilePath= new Path(AbsoluteFileName); - String OSFilePath= FilePath.toOSString(); + + protected void setEnvironmentVariables(InterpreterRunnerConfiguration configuration,int listenPort) { String DBGSessID; String env[]= new String[18]; + long id = Math.round(Math.random()*100000); + - DBGSessID = "DBGSESSID=0753972710000018@clienthost:" + listenPort; - + DBGSessID = "DBGSESSID="+id+"@clienthost:" + listenPort; + configuration.addEnvironmentValue("HTTP_COOKIE",DBGSessID,false); +/* configuration.addEnvironmentValue("REDIRECT_URL",OSFilePath,true); + configuration.addEnvironmentValue("REQUEST_URI",OSFilePath,true); + configuration.addEnvironmentValue("PATH_INFO",OSFilePath,true); + configuration.addEnvironmentValue("PATH_TRANSLATED",OSFilePath,true); + configuration.addEnvironmentValue("SCRIPT_FILENAME",interpreter,true); + configuration.addEnvironmentValue("SERVER_PROTOCOL","HTTP / 1.1",true); +*/ +/* env[0]= "HTTP_COOKIE=" + DBGSessID; env[1]= "REDIRECT_QUERY_STRING="; env[2]= "REDIRECT_STATUS=200"; @@ -56,17 +78,17 @@ public class DebuggerRunner extends InterpreterRunner { env[6]= "SERVER_ADDR=127.0.0.1"; env[7]= "SERVER_PORT=80"; env[8]= "REMOTE_ADDR=127.0.0.1"; - env[9]= "SCRIPT_FILENAME=c:\\php\\php.exe"; + env[9]= "SCRIPT_FILENAME=" + interpreter; env[10]= "GATEWAY_INTERFACE=CGI / 1.1"; env[11]= "SERVER_PROTOCOL=HTTP / 1.1"; env[12]= "REQUEST_METHOD=GET"; - env[13]= "QUERY_STRING="; + env[13]= "QUERY_STRING=test=1"; env[14]= "REQUEST_URI=" + OSFilePath; env[15]= "PATH_INFO=" + OSFilePath; env[16]= "PATH_TRANSLATED=" + OSFilePath; env[17]= "SystemRoot=" + Environment.getenv("SystemRoot"); - - return env; +*/ + // return env; } protected String getDebugCommandLineArgument() { @@ -76,7 +98,7 @@ public class DebuggerRunner extends InterpreterRunner { protected String renderLoadPath(InterpreterRunnerConfiguration configuration) { StringBuffer loadPath = new StringBuffer(); - PHPProject project = configuration.getProject(); + JavaProject project = configuration.getProject(); addToLoadPath(loadPath, project.getProject()); Iterator referencedProjects = project.getReferencedProjects().iterator();