misc/mirall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove app_status argument

Browse Source
This commit is contained in:
Ian Gulliver
2019-04-28 07:02:59 +00:00
parent bf16d74bbd
commit 323cfc15a5
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
example_simple
View File

Binary file not shown.

9
fastcgi_conn.cpp
View File

@@ -36,13 +36,9 @@ struct fcgi_begin_request {
}; };
struct fcgi_end_request { struct fcgi_end_request {
private: uint32_t app_status = htonl(0); // network byte order
uint32_t app_status_;
public:
uint8_t protocol_status; uint8_t protocol_status;
uint8_t reserved[3] = {}; uint8_t reserved[3] = {};
void SetAppStatus(uint32_t app_status) { app_status_ = htonl(app_status); }
}; };
struct fcgi_param_header { struct fcgi_param_header {
@@ -116,9 +112,8 @@ void FastCGIConn::WriteOutput(uint16_t request_id, const std::vector<iovec>& vec
WriteBlock(6, request_id, vecs); WriteBlock(6, request_id, vecs);
} }
void FastCGIConn::WriteEnd(uint16_t request_id, uint8_t status) { void FastCGIConn::WriteEnd(uint16_t request_id) {
fcgi_end_request end; fcgi_end_request end;
end.SetAppStatus(status);
std::vector<iovec> vecs; std::vector<iovec> vecs;
vecs.push_back(iovec{ vecs.push_back(iovec{

2
fastcgi_conn.h
View File

@@ -17,7 +17,7 @@ class FastCGIConn {
void WriteBlock(uint8_t type, uint16_t request_id, const std::vector<iovec>& vecs); void WriteBlock(uint8_t type, uint16_t request_id, const std::vector<iovec>& vecs);
void WriteOutput(uint16_t request_id, const std::vector<iovec>& vecs); void WriteOutput(uint16_t request_id, const std::vector<iovec>& vecs);
void WriteEnd(uint16_t request_id, uint8_t status); void WriteEnd(uint16_t request_id);
private: private:
void ParseBuf(); void ParseBuf();

2
fastcgi_request.cpp
View File

@@ -64,5 +64,5 @@ void FastCGIRequest::Write(const std::vector<std::pair<std::string_view, std::st
} }
void FastCGIRequest::WriteEnd() { void FastCGIRequest::WriteEnd() {
conn_->WriteEnd(request_id_, 0); conn_->WriteEnd(request_id_);
} }