mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 00:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Remove concurrency limit"

Browse Source 
This reverts commit f1a4973601.

This iss actually mistakenly added due to incorrect test setup.
This commit is contained in:
klzgrad 2020-10-09 22:01:37 +08:00
parent c773f0ceb1
commit 689f16f0d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/tools/naive/naive_proxy.cc
View File

@ -5,6 +5,7 @@
#include "net/tools/naive/naive_proxy.h" #include "net/tools/naive/naive_proxy.h"
#include <algorithm>
#include <utility> #include <utility>
#include "base/bind.h" #include "base/bind.h"
@ -34,7 +35,7 @@ NaiveProxy::NaiveProxy(std::unique_ptr<ServerSocket> listen_socket,
const NetworkTrafficAnnotationTag& traffic_annotation) const NetworkTrafficAnnotationTag& traffic_annotation)
: listen_socket_(std::move(listen_socket)), : listen_socket_(std::move(listen_socket)),
protocol_(protocol), protocol_(protocol),
concurrency_(concurrency), concurrency_(std::min(4, std::max(1, concurrency))),
resolver_(resolver), resolver_(resolver),
session_(session), session_(session),
net_log_( net_log_(

2
src/net/tools/naive/naive_proxy_bin.cc
View File

@ -289,7 +289,7 @@ bool ParseCommandLine(const CommandLine& cmdline, Params* params) {
if (!cmdline.concurrency.empty()) { if (!cmdline.concurrency.empty()) {
if (!base::StringToInt(cmdline.concurrency, &params->concurrency) || if (!base::StringToInt(cmdline.concurrency, &params->concurrency) ||
params->concurrency < 1) { params->concurrency < 1 || params->concurrency > 4) {
std::cerr << "Invalid concurrency" << std::endl; std::cerr << "Invalid concurrency" << std::endl;
return false; return false;
} }