--- JSON-XS/XS.xs	2007/08/26 22:27:32	1.62
+++ JSON-XS/XS.xs	2007/08/27 01:49:01	1.63
@@ -29,6 +29,8 @@
 #define F_SHRINK         0x00000200UL
 #define F_ALLOW_BLESSED  0x00000400UL
 #define F_CONV_BLESSED   0x00000800UL
+#define F_RELAXED        0x00001000UL
+
 #define F_MAXDEPTH       0xf8000000UL
 #define S_MAXDEPTH       27
 #define F_MAXSIZE        0x01f00000UL
@@ -710,6 +712,9 @@
           || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 
         break;
 
+      if (ch == '#' && dec->json.flags & F_RELAXED)
+        ++dec->cur;
+
       ++dec->cur;
     }
 }
@@ -1055,6 +1060,14 @@
           ERR (", or ] expected while parsing array");
 
         ++dec->cur;
+
+        decode_ws (dec);
+
+        if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
+          {
+            ++dec->cur;
+            break;
+          }
       }
 
   DEC_DEC_DEPTH;
@@ -1080,7 +1093,7 @@
   else
     for (;;)
       {
-        decode_ws (dec); EXPECT_CH ('"');
+        EXPECT_CH ('"');
 
         // heuristic: assume that
         // a) decode_str + hv_store_ent are abysmally slow.
@@ -1104,6 +1117,7 @@
 
                   decode_ws (dec); EXPECT_CH (':');
 
+                  decode_ws (dec);
                   value = decode_sv (dec);
                   if (!value)
                     {
@@ -1125,6 +1139,7 @@
 
                   decode_ws (dec); EXPECT_CH (':');
 
+                  decode_ws (dec);
                   value = decode_sv (dec);
                   if (!value)
                     goto fail;
@@ -1150,6 +1165,14 @@
           ERR (", or } expected while parsing object/hash");
 
         ++dec->cur;
+
+        decode_ws (dec);
+
+        if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
+          {
+            ++dec->cur;
+            break;
+          }
       }
 
   DEC_DEC_DEPTH;
@@ -1224,8 +1247,6 @@
 static SV *
 decode_sv (dec_t *dec)
 {
-  decode_ws (dec);
-
   // the beauty of JSON: you need exactly one character lookahead
   // to parse anything.
   switch (*dec->cur)
@@ -1319,6 +1340,8 @@
     dec.json.flags |= F_HOOK;
 
   *dec.end = 0; // this should basically be a nop, too, but make sure it's there
+
+  decode_ws (&dec);
   sv = decode_sv (&dec);
 
   if (!(offset_return || !sv))
@@ -1425,6 +1448,7 @@
         shrink          = F_SHRINK
         allow_blessed   = F_ALLOW_BLESSED
         convert_blessed = F_CONV_BLESSED
+        relaxed         = F_RELAXED
 	PPCODE:
 {
         if (enable)