Changeset 1947

Timestamp:

08/18/2007 11:14:12 AM (13 months ago)

Author:

jan

Message:

fixed handling of duplicate If-Modified-Since to return 304

- don't append the second string to the first, but free it instead

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/request.c (modified) (2 diffs)
• tests/request.t (modified) (1 diff)

branches/lighttpd-1.4.x/NEWS

@@ -20 +20 @@
   * fixed possible overflow in unix-socket path checks on BSD (#713)
   * fixed extra Content-Length header on 1xx, 204 and 304 (#1002)
+  * fixed handling of duplicate If-Modified-Since to return 304 
   * removed config-check if passwd files exist (#1188)
   

branches/lighttpd-1.4.x/src/request.c

@@ -923 +923 @@
                                                                                         ds->value->ptr)) {
                                                                         /* ignore it if they are the same */
+
+                                                                        ds->free((data_unset *)ds);
+                                                                        ds = NULL;
                                                                 } else {
                                                                         con->http_status = 400;
@@ -978 +981 @@
                                                         }
 
-                                                        array_insert_unique(con->request.headers, (data_unset *)ds);
+                                                        if (ds) array_insert_unique(con->request.headers, (data_unset *)ds);
                                                 } else {
                                                         /* empty header-fields are not allowed by HTTP-RFC, we just ignore them */

branches/lighttpd-1.4.x/tests/request.t

@@ -340 +340 @@
 
 $t->{REQUEST}  = ( <<EOF
-GET / HTTP/1.0
-If-Modified-Since: Sun, 1970 Jan 01 00:00:01 GMT
-If-Modified-Since: Sun, 1970 Jan 01 00:00:01 GMT
-EOF
- );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+GET /index.html HTTP/1.0
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ];
 ok($tf->handle_http($t) == 0, 'Duplicate If-Mod-Since, with equal timestamps');