Changeset 26e5e981299b93a275012a85ed2391e4a90605b7

Timestamp:

03/03/09 17:42:44 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1236102164 +0000

git-parent:

[b76d645b5e2d35c8e83bfd0f5e85cb6dc9573531]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1236102164 +0000

Message:

first whack at gzip encoding, refs #99

Files:

• src/noit_http.c (modified) (2 diffs)
• src/stratcon_realtime_http.c (modified) (1 diff)

src/noit_http.c

@@ -594 +594 @@
-  return len;
-}
+/* memgzip */
+static int memgzip2(Bytef *dest, uLongf *destLen,
+                    const Bytef *source, uLong sourceLen, int level) {
+    z_stream stream;
+    int err;
+
+    memset(&stream, 0, sizeof(stream));
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    err = deflateInit2(&stream, level, Z_DEFLATED, 15+16, 8,
+                       Z_DEFAULT_STRATEGY);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
-static noit_boolean
-_http_encode_chain(struct bchain *out, struct bchain *in, int opts) {
-  /* implement gzip and deflate! */
-  if(opts & NOIT_HTTP_GZIP) {
+    uLongf olen;
+    olen = out->allocd - out->start;
+    if(Z_OK != memgzip2((Bytef *)(out->buff + out->start), &olen,
+                        (Bytef *)(in->buff + in->start), (uLong)in->size,
+                        9)) {
+      noitL(noit_error, "zlib compress2 error\n");
+      return noit_false;
+    }
+    out->size += olen;
-  }
-  else if(opts & NOIT_HTTP_DEFLATE) {
@@ -633 +669 @@
-
-  ilen = in->size;
-compressBound(
+deflateBound(NULL, 
-  else if(opts & NOIT_HTTP_DEFLATE) ilen = compressBound(ilen);
-  out = bchain_alloc(hexlen + 4 + ilen);

src/stratcon_realtime_http.c

@@ -377 +377 @@
-    noit_http_response_status_set(ctx, 200, "OK");
-    noit_http_response_option_set(ctx, NOIT_HTTP_CHUNKED);
+    noit_http_response_option_set(ctx, NOIT_HTTP_GZIP);
-    /*noit_http_response_option_set(ctx, NOIT_HTTP_DEFLATE);*/
-    noit_http_response_header_set(ctx, "Content-Type", "text/html");