detect chrome before safari, chrome includes Safari/ in the UA header

[oweals/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 7604d7ed5d7592782f606f78b7c96b8d71b8b0b7..173285a7bd7a9fa94e2018bc7f30edb32d1c9ffa 100644 (file)
--- a/client.c
+++ b/client.c
@@ -110,7 +110,6 @@ void uh_request_done(struct client *cl)
 {
        uh_chunk_eof(cl);
        uh_dispatch_done(cl);
-       cl->us->notify_write = NULL;
        memset(&cl->dispatch, 0, sizeof(cl->dispatch));
 
        if (!conf.http_keepalive || cl->request.connection_close)
@@ -181,7 +180,8 @@ static int client_parse_request(struct client *cl, char *data)
 
        req->method = h_method;
        req->version = h_version;
-       if (req->version < UH_HTTP_VER_1_1 || !conf.http_keepalive)
+       if (req->version < UH_HTTP_VER_1_1 || req->method == UH_HTTP_MSG_POST ||
+           !conf.http_keepalive)
                req->connection_close = true;
 
        return CLIENT_STATE_HEADER;
@@ -195,8 +195,10 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        if (!newline)
                return false;
 
-       if (newline == buf)
+       if (newline == buf) {
+               ustream_consume(cl->us, 2);
                return true;
+       }
 
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
@@ -291,8 +293,6 @@ static void client_parse_header(struct client *cl, char *data)
        } else if (!strcmp(data, "connection")) {
                if (!strcasecmp(val, "close"))
                        r->connection_close = true;
-               else if (!strcasecmp(val, "keep-alive"))
-                       r->connection_close = false;
        } else if (!strcmp(data, "user-agent")) {
                char *str;
 
@@ -312,10 +312,11 @@ static void client_parse_header(struct client *cl, char *data)
                                        break;
                                }
                        }
-               } else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
-                       r->ua = UH_UA_SAFARI;
+               }
                else if (strstr(val, "Chrome/"))
                        r->ua = UH_UA_CHROME;
+               else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
+                       r->ua = UH_UA_SAFARI;
                else if (strstr(val, "Gecko/"))
                        r->ua = UH_UA_GECKO;
                else if (strstr(val, "Konqueror"))
@@ -568,6 +569,7 @@ bool uh_accept_client(int fd, bool tls)
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;
+       cl->tls = tls;
 
        return true;
 }