Changeset 467

Timestamp:

07/21/2005 08:59:30 PM (3 years ago)

Author:

jan

Message:

Added OPTIONS support

Location:

branches/lighttpd-1.3.x

Files:

• src/keyvalue.c (modified) (1 diff)
• src/keyvalue.h (modified) (1 diff)
• src/response.c (modified) (2 diffs)
• tests/core.t (modified) (2 diffs)

branches/lighttpd-1.3.x/src/keyvalue.c

@@ -16 +16 @@
         { HTTP_METHOD_POST, "POST" },
         { HTTP_METHOD_HEAD, "HEAD" },
+        { HTTP_METHOD_OPTIONS, "OPTIONS" },
         { HTTP_METHOD_UNSET, NULL }
 };

branches/lighttpd-1.3.x/src/keyvalue.h

@@ -8 +8 @@
 #endif
 
-typedef enum { HTTP_METHOD_UNSET = -1, HTTP_METHOD_GET, HTTP_METHOD_POST, HTTP_METHOD_HEAD } http_method_t;
+typedef enum { HTTP_METHOD_UNSET = -1, HTTP_METHOD_GET, HTTP_METHOD_POST, HTTP_METHOD_HEAD, HTTP_METHOD_OPTIONS } http_method_t;
 typedef enum { HTTP_VERSION_UNSET = -1, HTTP_VERSION_1_0, HTTP_VERSION_1_1 } http_version_t;
 

branches/lighttpd-1.3.x/src/response.c

@@ -93 +93 @@
                 
                 if (ds->value->used && ds->key->used &&
-                    0 != strncmp(ds->key->ptr, "X-LIGHTTPD-", sizeof("X-LIGHTTPD-") - 1)) {
+                    0 != strncmp(ds->key->ptr, "X-LIGHTTPD-", sizeof("X-LIGHTTPD-") - 1) &&
+                    /* headers we send */
+                    !buffer_is_equal_string(ds->key, CONST_STR_LEN("Server")) &&
+                    !buffer_is_equal_string(ds->key, CONST_STR_LEN("Date")) &&
+                    !buffer_is_equal_string(ds->key, CONST_STR_LEN("Transfer-Encoding")) &&
+                    !buffer_is_equal_string(ds->key, CONST_STR_LEN("Connection"))) {
                         BUFFER_APPEND_STRING_CONST(b, "\r\n");
                         buffer_append_string_buffer(b, ds->key);
@@ -859 +864 @@
                 }
                 
+                return HANDLER_FINISHED;
+        }
+
+        if (con->request.http_method == HTTP_METHOD_OPTIONS) {
+                con->file_finished = 1;
+                con->file_started = 1;
+
                 return HANDLER_FINISHED;
         }

branches/lighttpd-1.3.x/tests/core.t

@@ -10 +10 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 15;
+use Test::More tests => 16;
 use LightyTest;
 
@@ -116 +116 @@
 ok($tf->handle_http($t) == 0, 'URL-encoding, %00');
 
+$t->{REQUEST}  = ( <<EOF
+OPTIONS * HTTP/1.0
+EOF
+ );
+$t->{RESPONSE} = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+ok($tf->handle_http($t) == 0, 'OPTIONS');