MutexLock lock(&mutex);
Client new_client;
new_client.sock = sock;
- new_client.client_request.reserve(1024);
+ new_client.request.reserve(1024);
new_client.state = Client::READING_REQUEST;
new_client.header_bytes_sent = 0;
new_client.bytes_sent = 0;
}
// Guard against overlong requests gobbling up all of our space.
- if (client->client_request.size() + ret > MAX_CLIENT_REQUEST) {
+ if (client->request.size() + ret > MAX_CLIENT_REQUEST) {
fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
close_client(client);
return;
// See if we have \r\n\r\n anywhere in the request. We start three bytes
// before what we just appended, in case we just got the final character.
- size_t existing_req_bytes = client->client_request.size();
- client->client_request.append(string(buf, buf + ret));
+ size_t existing_req_bytes = client->request.size();
+ client->request.append(string(buf, buf + ret));
size_t start_at = (existing_req_bytes >= 3 ? existing_req_bytes - 3 : 0);
const char *ptr = reinterpret_cast<char *>(
- memmem(client->client_request.data() + start_at, client->client_request.size() - start_at,
+ memmem(client->request.data() + start_at, client->request.size() - start_at,
"\r\n\r\n", 4));
if (ptr == NULL) {
// OK, we don't have the entire header yet. Fine; we'll get it later.
return;
}
- if (ptr != client->client_request.data() + client->client_request.size() - 4) {
+ if (ptr != client->request.data() + client->request.size() - 4) {
fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
close_client(client);
return;
{
// TODO: Actually parse the request. :-)
client->stream_id = "stream";
+ client->request.clear();
// Construct the header.
client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
// The HTTP request, as sent by the client. If we are in READING_REQUEST,
// this might not be finished.
- std::string client_request;
+ std::string request;
- // What stream we're connecting to; parsed from client_request.
+ // What stream we're connecting to; parsed from <request>.
// Not relevant for READING_REQUEST.
std::string stream_id;