net/test/local_test_server.cc - Issue 10913268: Revert 156742 - Launch pywebsocket via net::TestServer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/test/local_test_server.cc

Issue 10913268: Revert 156742 - Launch pywebsocket via net::TestServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/test/local_test_server.cc

===================================================================

--- net/test/local_test_server.cc (revision 156770)

+++ net/test/local_test_server.cc (working copy)

@@ -176,8 +176,6 @@

AppendToPythonPath(third_party_dir.AppendASCII("tlslite"));

AppendToPythonPath(

third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));

- AppendToPythonPath(

- third_party_dir.AppendASCII("pywebsocket").AppendASCII("src"));

// Locate the Python code generated by the protocol buffers compiler.

FilePath pyproto_dir;

@@ -231,7 +229,7 @@

break;

case TYPE_WS:

case TYPE_WSS:

- command_line->AppendArg("--websocket");

+ // TODO(toyoshim): Handle correctly. See, http://crbug.com/137639 .

break;

case TYPE_FTP:

command_line->AppendArg("-f");

Property changes on: net/test/local_test_server.cc

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « net/test/base_test_server.cc ('k') | net/test/remote_test_server.cc » ('j') | no next file with comments »