Changeset 1871

Timestamp:

08/19/08 13:57:55 (3 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) (1 diff)
• cherokee/trunk/cherokee/handler_dirlist.c (modified) (1 diff)
• cherokee/trunk/cherokee/rule_directory.c (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-08-19  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection.c (cherokee_connection_set_redirect),
+        cherokee/connection-protected.h, cherokee/rule_directory.c,
+        cherokee/handler_dirlist.c, cherokee/connection.c: Fixes another
+        problem with redirections. It was failing to redirect requests
+        targeting a directory rule entry without a empty request (not even
+        the root slash). There is a new function now to perform this sort
+        of redirections, so it should be much safer to use it from
+        handler_dirilst and rule_directory.
-
-        * cherokee/handler_dirlist.c: Fixes a problem with redirections of

cherokee/trunk/cherokee/connection-protected.h

@@ -241 +241 @@
-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_error_headers    (cherokee_connection_t *conn);
+ret_t cherokee_connection_set_redirect           (cherokee_connection_t *conn, cherokee_buffer_t *address);
-
-ret_t cherokee_connection_clean_for_respin       (cherokee_connection_t *conn);

cherokee/trunk/cherokee/connection.c

@@ -2074 +2074 @@
-}
-#endif
+
+
+ret_t
+cherokee_connection_set_redirect (cherokee_connection_t *conn, cherokee_buffer_t *address)
+{
+        cuint_t len;
+
+        /* Build the redirection address
+         */
+        cherokee_buffer_clean (&conn->redirect);
+
+        len = conn->web_directory.len + 
+                address->len + 
+                conn->userdir.len + 
+                conn->host.len +
+                sizeof(":65535") +
+                sizeof("https://") + 4;
+        
+        cherokee_buffer_ensure_size (&conn->redirect, len);
+
+        /* In case the connection has a custom Document Root directory,
+         * it must add the web equivalent directory to the path (web_directory).
+         */
+        if (cherokee_connection_use_webdir (conn)) {
+                cherokee_buffer_add_buffer (&conn->redirect, &conn->web_directory);
+        }
+                
+        if (! cherokee_buffer_is_empty (&conn->host)) {
+                if (conn->socket.is_tls == TLS)
+                        cherokee_buffer_add_str (&conn->redirect, "https://");
+                else
+                        cherokee_buffer_add_str (&conn->redirect, "http://");
+                
+                cherokee_buffer_add_buffer (&conn->redirect, &conn->host);
+                
+                if (CONN_SRV(conn)->port != 80) {
+                        cherokee_buffer_add_str (&conn->redirect, ":");
+                        cherokee_buffer_add_long10 (&conn->redirect, CONN_SRV(conn)->port);
+                }
+        }
+        
+        if (! cherokee_buffer_is_empty (&conn->userdir)) {
+                cherokee_buffer_add_str (&conn->redirect, "/~");
+                cherokee_buffer_add_buffer (&conn->redirect, &conn->userdir);
+        }
+        
+        cherokee_buffer_add_buffer (&conn->redirect, address);
+        return ret_ok;
+}

cherokee/trunk/cherokee/handler_dirlist.c

@@ -459 +459 @@
-            (!cherokee_buffer_is_ending (&conn->request, '/'))) 
-        {
-                /* Build the redirection address
-                 */
-                cherokee_buffer_clean (&conn->redirect);
-
-                len = conn->web_directory.len + 
-                      conn->request.len + 
-                      conn->userdir.len + 
-                      conn->host.len +
-                      sizeof(":65535") +
-                      sizeof("https://") + 4;
-
-                cherokee_buffer_ensure_size (&conn->redirect, len);
-
-                /* In case the connection has a custom Document Root directory,
-                 * it must add the web equivalent directory to the path (web_directory).
-                 */
-                if (cherokee_connection_use_webdir (conn)) {
-                        cherokee_buffer_add_buffer (&conn->redirect, &conn->web_directory);
-                }
-                
-                if (! cherokee_buffer_is_empty (&conn->host)) {
-                        if (conn->socket.is_tls == TLS)
-                                cherokee_buffer_add_str (&conn->redirect, "https://");
-                        else
-                                cherokee_buffer_add_str (&conn->redirect, "http://");
-
-                        cherokee_buffer_add_buffer (&conn->redirect, &conn->host);
-
-                        if (CONN_SRV(conn)->port != 80) {
-                                cherokee_buffer_add_str (&conn->redirect, ":");
-                                cherokee_buffer_add_long10 (&conn->redirect, CONN_SRV(conn)->port);
-                        }
-                }
-        
-                if (! cherokee_buffer_is_empty (&conn->userdir)) {
-                        cherokee_buffer_add_str (&conn->redirect, "/~");
-                        cherokee_buffer_add_buffer (&conn->redirect, &conn->userdir);
-                }
-
-                cherokee_buffer_add_buffer (&conn->redirect, &conn->request);
-                cherokee_buffer_add_str (&conn->redirect, "/");
+                cherokee_connection_set_redirect (conn, &conn->redirect);
+                cherokee_buffer_drop_ending (&conn->redirect, 1);
-                
-                conn->error_code = http_moved_permanently;

cherokee/trunk/cherokee/rule_directory.c

@@ -69 +69 @@
-            (cherokee_buffer_cmp_buf (&conn->request, &rule->directory) == 0))
-        {
-ensure_size (&conn->redirect, conn->request.len + 4
-buffer_add_buffer (&conn->redirect, &conn->reques
-add (&conn->redirect, "/"
+add_str (&conn->redirect, "/"
+connection_set_redirect (conn, &conn->redirec
+drop_ending (&conn->redirect
-
-                TRACE(ENTRIES, "Had to redirect to: %s\n", conn->redirect.buf);