Changeset 1607

Timestamp:

07/04/08 14:08:58 (6 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection-protected.h (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-07-04  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection.c (cherokee_connection_use_webdir),
+        cherokee/connection-protected.h: New method. It points whether a
+        connection can use its web_directory property (which should only
+        be used when the 'conn_op_document_root' option is set and the
+        web_directory is longer than a single character).
-
-        * cherokee/connection-protected.h, cherokee/connection.c,

cherokee/trunk/cherokee/connection-protected.h

@@ -238 +238 @@
-ret_t cherokee_connection_build_local_directory  (cherokee_connection_t *conn, cherokee_virtual_server_t *vsrv, cherokee_config_entry_t *entry);
-ret_t cherokee_connection_build_local_directory_userdir (cherokee_connection_t *conn, cherokee_virtual_server_t *vsrv, cherokee_config_entry_t *entry);
+
-ret_t cherokee_connection_clean_for_respin       (cherokee_connection_t *conn);
+int   cherokee_connection_use_webdir             (cherokee_connection_t *conn);
-
-/* Log

cherokee/trunk/cherokee/connection.c

@@ -1178 +1178 @@
-                if (conn->web_directory.len > 1)
-                        cherokee_buffer_move_to_begin (&conn->request, conn->web_directory.len);
-
+
-                if ((conn->request.len >= 2) && (strncmp(conn->request.buf, "//", 2) == 0)) {
-                        cherokee_buffer_move_to_begin (&conn->request, 1);
@@ -1896 +1896 @@
-
-
+int
+cherokee_connection_use_webdir (cherokee_connection_t *conn)
+{
+        if (! (conn->options & conn_op_document_root))
+                return 0;
+
+        if (cherokee_buffer_is_empty (&conn->web_directory))
+                return 0;
+
+        return 1;
+}
+
+
-#ifdef TRACE_ENABLED
-char *