aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsgrb <sgrb@yandex-team.ru>2022-02-10 16:49:47 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:47 +0300
commit6a705ee267e43301156c202a4b371d47ddd4dd4f (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8
parent1485f03dbdc4314901c6ccea1fe17cc6943dea63 (diff)
downloadydb-6a705ee267e43301156c202a4b371d47ddd4dd4f.tar.gz
Restoring authorship annotation for <sgrb@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--library/cpp/coroutine/engine/poller.cpp4
-rw-r--r--library/cpp/http/fetch/http_socket.cpp2
-rw-r--r--library/cpp/http/fetch/httpload.cpp42
-rw-r--r--library/cpp/http/fetch/httpload.h18
4 files changed, 33 insertions, 33 deletions
diff --git a/library/cpp/coroutine/engine/poller.cpp b/library/cpp/coroutine/engine/poller.cpp
index c22bc8cd40..61164fa56b 100644
--- a/library/cpp/coroutine/engine/poller.cpp
+++ b/library/cpp/coroutine/engine/poller.cpp
@@ -282,8 +282,8 @@ namespace {
if (ev & POLLERR) {
status = EIO;
- } else if (ev & POLLHUP && pfd.events & POLLOUT) {
- // Only write operations may cause EPIPE
+ } else if (ev & POLLHUP && pfd.events & POLLOUT) {
+ // Only write operations may cause EPIPE
status = EPIPE;
} else if (ev & POLLNVAL) {
status = EINVAL;
diff --git a/library/cpp/http/fetch/http_socket.cpp b/library/cpp/http/fetch/http_socket.cpp
index f8315eb4d2..1524ef04a8 100644
--- a/library/cpp/http/fetch/http_socket.cpp
+++ b/library/cpp/http/fetch/http_socket.cpp
@@ -114,7 +114,7 @@ bool socketSecureHandler::Good() {
int socketSecureHandler::Connect(const TAddrList& addrs, TDuration Timeout) {
IsValid_ = false;
- int ret = socketRegularHandler::Connect(addrs, Timeout);
+ int ret = socketRegularHandler::Connect(addrs, Timeout);
if (ret)
return ret;
diff --git a/library/cpp/http/fetch/httpload.cpp b/library/cpp/http/fetch/httpload.cpp
index 7f0b165974..82ea8900b5 100644
--- a/library/cpp/http/fetch/httpload.cpp
+++ b/library/cpp/http/fetch/httpload.cpp
@@ -185,7 +185,7 @@ void httpLoadAgent::dropHeaderInstructions() {
bool httpLoadAgent::startRequest(const THttpURL& url,
bool persistent,
const TAddrList& addrs)
-
+
{
clearReader();
ErrCode_ = 0;
@@ -198,7 +198,7 @@ bool httpLoadAgent::startRequest(const THttpURL& url,
if (!HandleAuthorization_ && !URL_.IsNull(THttpURL::FlagAuth))
return false;
- return doSetHost(addrs) && doStartRequest();
+ return doSetHost(addrs) && doStartRequest();
}
/************************************************************/
@@ -206,22 +206,22 @@ bool httpLoadAgent::startRequest(const char* url,
const char* url_to_merge,
bool persistent,
const TAddrList& addrs) {
- clearReader();
-
- URL_.Clear();
- PersistentConn_ = persistent;
-
- long flags = THttpURL::FeatureSchemeKnown | THttpURL::FeaturesNormalizeSet;
- if (HandleAuthorization_)
- flags |= THttpURL::FeatureAuthSupported;
-
- if (URL_.Parse(url, flags, url_to_merge) || !URL_.IsValidGlobal())
- return false;
-
- return doSetHost(addrs) && doStartRequest();
-}
-
-/************************************************************/
+ clearReader();
+
+ URL_.Clear();
+ PersistentConn_ = persistent;
+
+ long flags = THttpURL::FeatureSchemeKnown | THttpURL::FeaturesNormalizeSet;
+ if (HandleAuthorization_)
+ flags |= THttpURL::FeatureAuthSupported;
+
+ if (URL_.Parse(url, flags, url_to_merge) || !URL_.IsValidGlobal())
+ return false;
+
+ return doSetHost(addrs) && doStartRequest();
+}
+
+/************************************************************/
bool httpLoadAgent::startRequest(const char* url,
const char* url_to_merge,
bool persistent,
@@ -238,7 +238,7 @@ bool httpLoadAgent::startRequest(const char* url,
if (URL_.Parse(url, flags, url_to_merge) || !URL_.IsValidGlobal())
return false;
- return doSetHost(TAddrList::MakeV4Addr(ip, URL_.GetPort())) && doStartRequest();
+ return doSetHost(TAddrList::MakeV4Addr(ip, URL_.GetPort())) && doStartRequest();
}
/************************************************************/
@@ -250,7 +250,7 @@ bool httpLoadAgent::doSetHost(const TAddrList& addrs) {
if (addrs.size()) {
ErrCode_ = SetHost(URL_.Get(THttpURL::FieldHost),
- URL_.GetPort(), addrs);
+ URL_.GetPort(), addrs);
} else {
ErrCode_ = SetHost(URL_.Get(THttpURL::FieldHost),
URL_.GetPort());
@@ -292,7 +292,7 @@ bool httpLoadAgent::setHost(const char* host_url,
if (URL_.Parse(host_url, flags) || !URL_.IsValidGlobal())
return false;
- return doSetHost(addrs);
+ return doSetHost(addrs);
}
/************************************************************/
diff --git a/library/cpp/http/fetch/httpload.h b/library/cpp/http/fetch/httpload.h
index 59dcacb97f..e22e4b809e 100644
--- a/library/cpp/http/fetch/httpload.h
+++ b/library/cpp/http/fetch/httpload.h
@@ -24,7 +24,7 @@ class socketAbstractHandler {
public:
virtual bool Good() = 0;
- virtual int Connect(const TAddrList& addrs, TDuration Timeout) = 0;
+ virtual int Connect(const TAddrList& addrs, TDuration Timeout) = 0;
virtual void Disconnect() = 0;
@@ -123,7 +123,7 @@ public:
}
int Connect(const TAddrList& addrs, TDuration Timeout) override {
- return Socket_.Connect(addrs, Timeout);
+ return Socket_.Connect(addrs, Timeout);
}
void Disconnect() override {
@@ -234,7 +234,7 @@ protected:
httpDigestHandler Digest_;
void clearReader();
- bool doSetHost(const TAddrList& addrs);
+ bool doSetHost(const TAddrList& addrs);
bool doStartRequest();
public:
@@ -250,17 +250,17 @@ public:
bool startRequest(const char* url,
const char* url_to_merge = nullptr,
bool persistent = false,
- const TAddrList& addrs = TAddrList());
+ const TAddrList& addrs = TAddrList());
- // deprecated v4-only
- bool startRequest(const char* url,
- const char* url_to_merge,
+ // deprecated v4-only
+ bool startRequest(const char* url,
+ const char* url_to_merge,
bool persistent,
ui32 ip);
-
+
bool startRequest(const THttpURL& url,
bool persistent = false,
- const TAddrList& addrs = TAddrList());
+ const TAddrList& addrs = TAddrList());
bool setHost(const char* host_url,
const TAddrList& addrs = TAddrList());