OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/test/test_server.h" | 5 #include "net/test/test_server.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 // At this point, the port that the testserver will listen on is unknown. | 267 // At this point, the port that the testserver will listen on is unknown. |
268 // The testserver will listen on an ephemeral port, and write the port | 268 // The testserver will listen on an ephemeral port, and write the port |
269 // number out over a pipe that this TestServer object will read from. Once | 269 // number out over a pipe that this TestServer object will read from. Once |
270 // that is complete, the host_port_pair_ will contain the actual port. | 270 // that is complete, the host_port_pair_ will contain the actual port. |
271 host_port_pair_ = HostPortPair(GetHostname(type_, https_options_), 0); | 271 host_port_pair_ = HostPortPair(GetHostname(type_, https_options_), 0); |
272 process_handle_ = base::kNullProcessHandle; | 272 process_handle_ = base::kNullProcessHandle; |
273 | 273 |
274 FilePath src_dir; | 274 FilePath src_dir; |
275 PathService::Get(base::DIR_SOURCE_ROOT, &src_dir); | 275 PathService::Get(base::DIR_SOURCE_ROOT, &src_dir); |
276 | 276 |
277 document_root_ = src_dir.Append(document_root); | 277 if (document_root.IsAbsolute()) { |
| 278 document_root_ = document_root; |
| 279 } else { |
| 280 document_root_ = src_dir.Append(document_root); |
| 281 } |
278 | 282 |
279 certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net")) | 283 certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net")) |
280 .Append(FILE_PATH_LITERAL("data")) | 284 .Append(FILE_PATH_LITERAL("data")) |
281 .Append(FILE_PATH_LITERAL("ssl")) | 285 .Append(FILE_PATH_LITERAL("ssl")) |
282 .Append(FILE_PATH_LITERAL("certificates")); | 286 .Append(FILE_PATH_LITERAL("certificates")); |
283 | 287 |
284 // TODO(battre) Remove this after figuring out why the TestServer is flaky. | 288 // TODO(battre) Remove this after figuring out why the TestServer is flaky. |
285 // http://crbug.com/96594 | 289 // http://crbug.com/96594 |
286 log_to_console_ = true; | 290 log_to_console_ = true; |
287 } | 291 } |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256) | 412 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256) |
409 command_line->AppendArg(kBulkCipherSwitch + "=aes256"); | 413 command_line->AppendArg(kBulkCipherSwitch + "=aes256"); |
410 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES) | 414 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES) |
411 command_line->AppendArg(kBulkCipherSwitch + "=3des"); | 415 command_line->AppendArg(kBulkCipherSwitch + "=3des"); |
412 } | 416 } |
413 | 417 |
414 return true; | 418 return true; |
415 } | 419 } |
416 | 420 |
417 } // namespace net | 421 } // namespace net |
OLD | NEW |