Changeset 1451

Timestamp:

May 19, 2009 8:37:02 AM (12 years ago)

Author:

gah

Message:

 

Location:

trunk/src/core

Files:

• RpEncode.cc (modified) (3 diffs)
• RpEncode.h (modified) (1 diff)

trunk/src/core/RpEncode.cc

@@ -103 +103 @@
 }
 
+bool
+Rappture::encoding::isGzipped(const char* buf, int size)
+{
+    if (buf == NULL) {
+        return false;                   /* Really should let this segfault. */
+    }
+    return ((buf[0] == 0x1f)  && (buf[1] == 0x8b));
+}
+
 /**********************************************************************/
 // FUNCTION: Rappture::encoding::headerFlags()
@@ -261 +270 @@
             size -= 14;
             headerFlags |= (RPENC_B64 | RPENC_Z);
+        } else if ((size > 13) && (strncmp(bytes, "@@RP-ENC:raw\n", 14) == 0)){
+            bytes += 13;
+            size -= 13;
         } 
          if (headerFlags != 0) {
@@ -281 +293 @@
         }
     }
-    if ((flags & (RPENC_B64 | RPENC_Z)) == 0) {
-        return true;                /* No decode or decompress flags present. */
-    }
     if (outData.append(bytes, size) != (int)size) {
         status.addError("can't append %d bytes to buffer", size);
         return false;
     }
-    if (!outData.decode(status, flags)) {
-        return false;
+    if (flags & (RPENC_B64 | RPENC_Z)) {
+        if (!outData.decode(status, flags)) {
+            return false;
+        }
     }
     buf.move(outData);

trunk/src/core/RpEncode.h

@@ -34 +34 @@
 bool isBinary(const char* buf, int size);
 bool isBase64(const char* buf, int size);
+bool isGzipped(const char* buf, int size);
 unsigned int headerFlags(const char* buf, int size);
 bool encode(Rappture::Outcome &err, Rappture::Buffer& buf, unsigned int flags);