[src/trunk]: src/libexec/httpd Check in very basic compressed file support. ...

[elric <elric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21e51203c3b6
branches:  trunk
changeset: 777480:21e51203c3b6
user:      elric <elric%NetBSD.org@localhost>
date:      Mon Feb 20 09:26:56 2012 +0000

description:
Check in very basic compressed file support.  httpd will now serve
a precompressed .gz file if it exists, the client claims to support
gzip and the request is not ranged.

diffstat:

 libexec/httpd/bozohttpd.8 |   9 +++++-
 libexec/httpd/bozohttpd.c |  69 ++++++++++++++++++++++++++++++++++++++++++++--
 libexec/httpd/bozohttpd.h |   3 +-
 3 files changed, 76 insertions(+), 5 deletions(-)

diffs (146 lines):

diff -r 2ce7d42d1b92 -r 21e51203c3b6 libexec/httpd/bozohttpd.8
--- a/libexec/httpd/bozohttpd.8 Mon Feb 20 08:40:46 2012 +0000
+++ b/libexec/httpd/bozohttpd.8 Mon Feb 20 09:26:56 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: bozohttpd.8,v 1.32 2011/11/18 09:51:31 mrg Exp $
+.\"    $NetBSD: bozohttpd.8,v 1.33 2012/02/20 09:26:56 elric Exp $
 .\"
 .\"    $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -408,6 +408,13 @@
 with
 .Dq -DNO_SSL_SUPPORT
 on the compiler command line.
+.Ss COMPRESSION
+.Nm
+supports a very basic form compression.
+.Nm
+will serve the requested file postpended with ``.gz'' if
+it exists, it is readable, the client requested gzip compression, and
+the client did not make a ranged request.
 .Sh FILES
 .Nm
 looks for a couple of special files in directories that allow certain features
diff -r 2ce7d42d1b92 -r 21e51203c3b6 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Mon Feb 20 08:40:46 2012 +0000
+++ b/libexec/httpd/bozohttpd.c Mon Feb 20 09:26:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.c,v 1.30 2011/11/18 09:51:31 mrg Exp $       */
+/*     $NetBSD: bozohttpd.c,v 1.31 2012/02/20 09:26:56 elric Exp $     */
 
 /*     $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $      */
 
@@ -696,6 +696,9 @@
                        else if (strcasecmp(hdr->h_header,
                                        "if-modified-since") == 0)
                                request->hr_if_modified_since = hdr->h_value;
+                       else if (strcasecmp(hdr->h_header,
+                                       "accept-encoding") == 0)
+                               request->hr_accept_encoding = hdr->h_value;
 
                        debug((httpd, DEBUG_FAT, "adding header %s: %s",
                            hdr->h_header, hdr->h_value));
@@ -1350,6 +1353,53 @@
 }
 
 /*
+ * can_gzip checks if the request supports and prefers gzip encoding.
+ *
+ * XXX: we do not consider the associated q with gzip in making our
+ *      decision which is broken.
+ */
+
+static int
+can_gzip(bozo_httpreq_t *request)
+{
+       const char      *pos;
+       const char      *tmp;
+       size_t           len;
+
+       /* First we decide if the request can be gzipped at all. */
+
+       /* not if we already are encoded... */
+       tmp = bozo_content_encoding(request, request->hr_file);
+       if (tmp && *tmp)
+               return 0;
+
+       /* not if we are not asking for the whole file... */
+       if (request->hr_last_byte_pos != -1 || request->hr_have_range)
+               return 0;
+
+       /* Then we determine if gzip is on the cards. */
+
+       for (pos = request->hr_accept_encoding; pos && *pos; pos += len) {
+               while (*pos == ' ')
+                       pos++;
+
+               len = strcspn(pos, ";,");
+
+               if ((len == 4 && strncasecmp("gzip", pos, 4) == 0) ||
+                   (len == 6 && strncasecmp("x-gzip", pos, 6) == 0))
+                       return 1;
+
+               if (pos[len] == ';')
+                       len += strcspn(&pos[len], ",");
+
+               if (pos[len])
+                       len++;
+       }
+
+       return 0;
+}
+
+/*
  * bozo_process_request does the following:
  *     - check the request is valid
  *     - process cgi-bin if necessary
@@ -1374,9 +1424,21 @@
        if (transform_request(request, &isindex) == 0)
                return;
 
+       fd = -1;
+       encoding = NULL;
+       if (can_gzip(request)) {
+               asprintf(&file, "%s.gz", request->hr_file);
+               fd = open(file, O_RDONLY);
+               if (fd >= 0)
+                       encoding = "gzip";
+               free(file);
+       }
+
        file = request->hr_file;
 
-       fd = open(file, O_RDONLY);
+       if (fd < 0)
+               fd = open(file, O_RDONLY);
+
        if (fd < 0) {
                debug((httpd, DEBUG_FAT, "open failed: %s", strerror(errno)));
                if (errno == EPERM)
@@ -1432,7 +1494,8 @@
 
        if (request->hr_proto != httpd->consts.http_09) {
                type = bozo_content_type(request, file);
-               encoding = bozo_content_encoding(request, file);
+               if (!encoding)
+                       encoding = bozo_content_encoding(request, file);
 
                bozo_print_header(request, &sb, type, encoding);
                bozo_printf(httpd, "\r\n");
diff -r 2ce7d42d1b92 -r 21e51203c3b6 libexec/httpd/bozohttpd.h
--- a/libexec/httpd/bozohttpd.h Mon Feb 20 08:40:46 2012 +0000
+++ b/libexec/httpd/bozohttpd.h Mon Feb 20 09:26:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.h,v 1.20 2011/11/18 09:51:31 mrg Exp $       */
+/*     $NetBSD: bozohttpd.h,v 1.21 2012/02/20 09:26:56 elric Exp $     */
 
 /*     $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $       */
 
@@ -128,6 +128,7 @@
        const char *hr_referrer;
        const char *hr_range;
        const char *hr_if_modified_since;
+       const char *hr_accept_encoding;
        int         hr_have_range;
        off_t       hr_first_byte_pos;
        off_t       hr_last_byte_pos;