Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
pistache
Commits
b72ea357
Commit
b72ea357
authored
Feb 07, 2016
by
octal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some code cleanup
parent
6d35e560
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
43 deletions
+10
-43
include/http.h
include/http.h
+3
-13
src/client/client.cc
src/client/client.cc
+0
-30
src/common/http.cc
src/common/http.cc
+7
-0
No files found.
include/http.h
View file @
b72ea357
...
...
@@ -98,9 +98,8 @@ public:
friend
class
Private
::
Parser
<
Http
::
Request
>
;
friend
class
RequestBuilder
;
// @Todo: try to remove the need for friend-ness here
friend
class
Client
;
friend
class
ResponseWriter
;
friend
class
Timeout
;
Request
(
const
Request
&
other
)
=
default
;
Request
&
operator
=
(
const
Request
&
other
)
=
default
;
...
...
@@ -154,6 +153,7 @@ private:
class
RequestBuilder
{
public:
RequestBuilder
&
method
(
Method
method
);
RequestBuilder
&
resource
(
std
::
string
val
);
RequestBuilder
&
params
(
const
Uri
::
Query
&
query
);
RequestBuilder
&
header
(
const
std
::
shared_ptr
<
Header
::
Header
>&
header
);
...
...
@@ -172,6 +172,7 @@ public:
const
Request
&
request
()
const
{
return
request_
;
}
operator
Request
()
const
{
return
request_
;
}
private:
Request
request_
;
};
...
...
@@ -236,11 +237,6 @@ public:
}
private:
Timeout
()
:
handler
(
nullptr
)
,
transport
(
nullptr
)
{
}
Timeout
(
Tcp
::
Transport
*
transport
,
Handler
*
handler
,
Request
request
)
...
...
@@ -520,12 +516,6 @@ public:
}
private:
ResponseWriter
()
:
Response
()
,
buf_
(
0
)
,
transport_
(
nullptr
)
{
}
ResponseWriter
(
Tcp
::
Transport
*
transport
,
Request
request
,
Handler
*
handler
)
:
Response
(
request
.
version
())
,
buf_
(
DefaultStreamSize
)
...
...
src/client/client.cc
View file @
b72ea357
...
...
@@ -382,33 +382,6 @@ Connection::perform(
});
}
#if 0
struct OnRequestWriteCompleted {
OnRequestWriteCompleted(
const std::shared_ptr<Transport>& transport,
Fd fd,
Async::Resolver resolve, Async::Rejection reject,
Connection::OnDone onDone)
: transport(transport)
, fd(fd)
, resolve(std::move(resolve))
, reject(std::move(reject))
, onDone(std::move(onDone))
{ }
void operator()(size_t bytes) {
transport->addInFlight(fd, std::move(resolve), std::move(reject));
onDone();
}
std::shared_ptr<Transport> transport;
Fd fd;
Async::Resolver resolve;
Async::Rejection reject;
Connection::OnDone onDone;
};
#endif
void
Connection
::
performImpl
(
const
Http
::
Request
&
request
,
...
...
@@ -423,9 +396,6 @@ Connection::performImpl(
reject
(
std
::
runtime_error
(
"Could not write request"
));
auto
buffer
=
buf
.
buffer
();
#if 0
OnRequestWriteCompleted onCompleted(transport_, fd, std::move(resolve), std::move(reject), std::move(onDone));
#endif
transport_
->
asyncSendRequest
(
fd
,
buffer
,
std
::
move
(
resolve
),
std
::
move
(
reject
),
std
::
move
(
onDone
));
}
...
...
src/common/http.cc
View file @
b72ea357
...
...
@@ -559,6 +559,13 @@ Request::peer() const {
}
#endif
RequestBuilder
&
RequestBuilder
::
method
(
Method
method
)
{
request_
.
method_
=
method
;
return
*
this
;
}
RequestBuilder
&
RequestBuilder
::
resource
(
std
::
string
val
)
{
request_
.
resource_
=
std
::
move
(
val
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment