Changeset 11914 in project

Timestamp:

09/06/08 23:46:11 (12 years ago)

Author:

sjamaan

Message:

Implement improvement for entity-tag parser which makes it distinguish between quoted strong headers starting with 'W/' as value and regular weak headers

Location:

release/4/intarweb/trunk

Files:

• header-parsers.scm (modified) (1 diff)
• intarweb.scm (modified) (1 diff)
• tests/run.scm (modified) (2 diffs)

release/4/intarweb/trunk/header-parsers.scm

@@ -203 +203 @@
 
 ;; (W/)<string>
-(define (entity-tag-parser contents)
-  (if (string-prefix? "W/" contents)
-      `(weak . ,(string-drop contents 2))
-      `(strong . ,contents)))
+(define (entity-tag-parser name contents headers)
+  (let ((contents (string-trim-both contents)))
+    (replace-header-contents!
+     name
+     (list (if (string-prefix? "W/" contents)
+               (vector `(weak . ,(parse-token contents 2 (char-set))) '())
+               (vector `(strong . ,(parse-token contents 0 (char-set))) '())))
+     headers)))
 
 ;;;; MAJOR TODOs

release/4/intarweb/trunk/intarweb.scm

@@ -222 +222 @@
      (content-type . ,(single symbol-parser-ci))
      (date . ,(single http-time-parser))
-     (etag . ,(single entity-tag-parser))
+     (etag . ,entity-tag-parser)
      (expect . ,(single key/values))
      (expires . ,(single rfc822-time-parser))

release/4/intarweb/trunk/tests/run.scm

@@ -187 +187 @@
             '(strong . "")
             (get-value (car (header-contents 'etag headers)))))
-    ;; XXX, is this test important to pass?
-    #;(let ((headers (test-read-headers "Etag: \"W/bar\"")))
+    (let ((headers (test-read-headers "Etag: \"W/bar\"")))
         (test "Strong tag, containing W/ prefix"
-              '(strong . "W/foo")
+              '(strong . "W/bar")
               (get-value (car (header-contents 'etag headers))))))
 
@@ -559 +558 @@
 ;; - Use SRFI-19
 ;; - Rethink the auto-chunking stuff. Maybe this should be done at a higher level
+;; - Think about a good naming convention to distinguish parsers that accept
+;;    one argument (an already-tokenized string) or multiple (raw header data)