Changeset 1766

Timestamp:

08/07/08 17:13:47 (4 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (1 diff)
• cherokee/trunk/cherokee/handler_error_nn.c (modified) (2 diffs)
• cherokee/trunk/cherokee/handler_error_nn.h (modified) (1 diff)
• cherokee/trunk/qa/048-NN.py (modified) (2 diffs)
• cherokee/trunk/qa/049-NN-broken.py (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-08-07  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/handler_error_nn.c, cherokee/handler_error_nn.h,
+        qa/049-NN-broken.py, qa/048-NN.py: Fixes the NN support and adapts
+        the QA test to the new behavior (it is error handler now).
-
-        * cherokee/connection.c (cherokee_connection_parse_header): Adds a

cherokee/trunk/cherokee/connection.c

@@ -372 +372 @@
-        if ((entry != NULL) && (entry->handler_new_func != NULL)) {
-                ret = entry->handler_new_func ((void **) &conn->handler, conn, entry->handler_properties);
-
+
+
-        } 
-

cherokee/trunk/cherokee/handler_error_nn.c

@@ -133 +133 @@
-
-
-
-
-
-
+
+
-{
-
+
+
-
-        cherokee_buffer_clean (&conn->redirect);
@@ -145 +144 @@
-        if (unlikely (ret != ret_ok)) {
-                conn->error_code = http_not_found;
-cherokee_handler_error_new (hdl, conn, props)
+ret_error
-        }
-
-
-
-
-
+
+
-}
-
+static ret_t 
+error_nn_add_headers (cherokee_handler_error_t *hdl, cherokee_buffer_t *buffer)
+{
+        UNUSED(hdl);
+        UNUSED(buffer);
+
+        return ret_ok;
+}
+
+static ret_t
+error_nn_step (cherokee_handler_error_t *hdl, cherokee_buffer_t *buffer)
+{
+        UNUSED(hdl);
+        UNUSED(buffer);
+
+        return ret_eof;
+}
+
+static ret_t 
+error_nn_free (cherokee_handler_error_t *hdl)
+{
+        UNUSED(hdl);
+
+        return ret_ok;
+}
+
+
+ret_t 
+cherokee_handler_error_nn_new (cherokee_handler_t      **hdl, 
+                               cherokee_connection_t    *conn,
+                               cherokee_module_props_t  *props)
+{
+        CHEROKEE_NEW_STRUCT (n, handler_error_nn);
+           
+        cherokee_handler_init_base (HANDLER(n), conn, HANDLER_PROPS(props), PLUGIN_INFO_HANDLER_PTR(error_nn));
+        HANDLER(n)->support = hsupport_error | hsupport_length;
+
+        MODULE(n)->init         = (handler_func_init_t) error_nn_init;
+        MODULE(n)->free         = (module_func_free_t) error_nn_free;
+        HANDLER(n)->step        = (handler_func_step_t) error_nn_step;
+        HANDLER(n)->add_headers = (handler_func_add_headers_t) error_nn_add_headers;
+
+        *hdl = HANDLER(n);
+        return ret_ok;
+}
+
+

cherokee/trunk/cherokee/handler_error_nn.h

@@ -31 +31 @@
-#include "plugin_loader.h"
-
+typedef struct {
+        cherokee_handler_t handler;
+} cherokee_handler_error_nn_t;
+
-/* Library init function
- */

cherokee/trunk/qa/048-NN.py

@@ -3 +3 @@
-MAGIC = "Sesamo"
-CONTENT = "This is the content of " + MAGIC
+HOST = "nn1"
-
-CONF = """
-
-
-
-
+
+
+
+
+
+
-
-class Test (TestBase):
@@ -15 +18 @@
-        self.name = "NN"
-
-nn1/Xesano HTTP/1.0\r\n"
-self.conf              = CONF
-200
-expected_content 
-forbidden_content = "Location: "
+Xesano HTTP/1.1\r\n" + \
+                         "Host: %s\r\n" %(HOST)
+302
+forbidden_content
+expected_content  = "Location: /"+MAGIC
-
-    def Prepare (self, www):
-
-
-
-
-
+
+
+
+
+
+
+
+

cherokee/trunk/qa/049-NN-broken.py

@@ -1 +1 @@
-from base import *
-
+HOST = "nn2"
+
-CONF = """
-
-
-
+
+
+
+
+
-"""
-
@@ -12 +16 @@
-        self.name = "Broken NN"
-
-  = "GET /missing/ HTTP/1.0\r\n"
-self.conf             = CONF
-  
+= "GET /missing HTTP/1.1\r\n" + \
+                      "Host: %s\r\n" % (HOST)
+
-
+    def Prepare (self, www):
+        d = self.Mkdir (www, "nn2_root")
+        self.conf = CONF % (HOST, d)