hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added HTTP/1.1 and Connection: close

Browse Source 
Fixed the gwbuff size: next write the httpd_print_str()
This commit is contained in:
Massimiliano Pinto
2013-07-08 10:28:40 +02:00
parent 37ba2738ba
commit df34284d46
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/protocol/httpd.c
View File

@ -162,11 +162,6 @@ GWBUF *buffer=NULL;
return 0;
}
if ((buffer = gwbuf_alloc(1024)) == NULL) {
//httpd_error(dcb->fd);
return 0;
}
if (strcasecmp(method, "POST") == 0)
cgi = 1;
@ -195,7 +190,13 @@ GWBUF *buffer=NULL;
httpd_send_headers(dcb->fd, NULL);
if ((buffer = gwbuf_alloc(1024)) == NULL) {
//httpd_error(dcb->fd);
return 0;
}
strcpy(GWBUF_DATA(buffer), "Welcome to HTTPD Gateway (c)\n");
buffer->end = GWBUF_DATA(buffer) + strlen(GWBUF_DATA(buffer));
dcb->func.write(dcb, buffer);
@ -381,6 +382,9 @@ httpd_command(DCB *dcb, char *cmd)
{
}
/**
* HTTPD get line from client
*/
static int httpd_get_line(int sock, char *buf, int size) {
int i = 0;
char c = '\0';
@ -412,17 +416,22 @@ static int httpd_get_line(int sock, char *buf, int size) {
return(i);
}
/**
* HTTPD send headers with 200 OK
*/
static void httpd_send_headers(int client, const char *filename)
{
char buf[1024];
(void)filename; /* could use filename to determine file type */
strcpy(buf, "HTTP/1.0 200 OK\r\n");
strcpy(buf, "HTTP/1.1 200 OK\r\n");
send(client, buf, strlen(buf), 0);
strcpy(buf, HTTP_SERVER_STRING);
send(client, buf, strlen(buf), 0);
sprintf(buf, "Content-Type: text/html\r\n");
send(client, buf, strlen(buf), 0);
sprintf(buf, "Connection: close\r\n");
send(client, buf, strlen(buf), 0);
strcpy(buf, "\r\n");
send(client, buf, strlen(buf), 0);
}