Browse Source

now only use keep-alive....

master
Georg Hopp 14 years ago
parent
commit
6c888a8c07
  1. 2
      src/http/request/parser.c
  2. 8
      src/server/run.c

2
src/http/request/parser.c

@ -64,7 +64,7 @@ get_data(void * _this, int fd)
size_t remaining, chunks; size_t remaining, chunks;
char buffer[1024]; char buffer[1024];
size_t size = read(fd, buffer, 1024);
ssize_t size = read(fd, buffer, 1024);
if (0 < size) { if (0 < size) {
remaining = this->buffer_used % HTTP_REQUEST_PARSER_READ_CHUNK; remaining = this->buffer_used % HTTP_REQUEST_PARSER_READ_CHUNK;

8
src/server/run.c

@ -99,6 +99,7 @@ serverRun(Server this)
char timestr[200]; char timestr[200];
#define RESP_HEAD "HTTP/1.1 404 Not Found\r\n" \ #define RESP_HEAD "HTTP/1.1 404 Not Found\r\n" \
"Connection: Keep-Alive\r\n" \
"Content-Type: text/html\r\n" \ "Content-Type: text/html\r\n" \
"Content-Length: %lu\r\n" \ "Content-Length: %lu\r\n" \
"Date: %s\r\n" \ "Date: %s\r\n" \
@ -120,8 +121,8 @@ serverRun(Server this)
* @TODO: just to send an answer and be able to make some * @TODO: just to send an answer and be able to make some
* apache benchs i do it here...this definetly MUST BE moved * apache benchs i do it here...this definetly MUST BE moved
*/ */
sprintf((this->conns)[fd].wbuf, RESP_HEAD "\r\n" RESP_DATA, sizeof(RESP_DATA), timestr);
(this->fds)[i].events = (this->fds)[i].events | POLLOUT;
sprintf((this->conns)[fd].wbuf, RESP_HEAD "\r\n" RESP_DATA, sizeof(RESP_DATA) - 1, timestr);
(this->fds)[i].events |= POLLOUT;
} }
queue->nrequests = 0; queue->nrequests = 0;
@ -147,7 +148,8 @@ serverRun(Server this)
"write error, closing connection"); "write error, closing connection");
} }
serverCloseConn(this, i);
//serverCloseConn(this, i);
(this->fds)[i].events &= ~POLLOUT;
} }
else { else {
memmove((this->conns)[fd].wbuf, memmove((this->conns)[fd].wbuf,

Loading…
Cancel
Save