Changeset 1788

Timestamp:

08/12/08 23:14:34 (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/thread.c (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-08-12  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection.c (cherokee_connection_clean_error_headers),
+        cherokee/thread.c (process_active_connections): It had to remove
+        the Content-Length header if the handler is not reporting error
+        messages because it has to add its own. Fixes a bug with previous
+        versions (cgi, fcgi and scgi).
+
-2008-08-12  Taher Shihadeh <taher@unixwars.com>
-        * doc/cookbook_ror.txt, doc/cookbook_php.txt,

cherokee/trunk/cherokee/connection-protected.h

@@ -239 +239 @@
-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_error_headers    (cherokee_connection_t *conn);
-
-ret_t cherokee_connection_clean_for_respin       (cherokee_connection_t *conn);

cherokee/trunk/cherokee/connection.c

@@ -1906 +1906 @@
-
-
+ret_t
+cherokee_connection_clean_error_headers (cherokee_connection_t *conn)
+{
+        char *begin;
+        char *end;
+
+        if (cherokee_buffer_is_empty (&conn->header_buffer))
+                return ret_ok;
+
+        begin = strcasestr (conn->header_buffer.buf, "Content-Length: ");
+        if (begin != NULL) {
+                end = strchr (begin+16, CHR_CR);
+                if (end == NULL)
+                        return ret_error;
+
+                if (end[1] == CHR_LF)
+                        end++;
+
+                cherokee_buffer_remove_chunk (&conn->header_buffer, 
+                                              begin - conn->header_buffer.buf, 
+                                              (end-begin)+1);
+        }
+
+        return ret_ok;
+}
+
+
-int
-cherokee_connection_use_webdir (cherokee_connection_t *conn)

cherokee/trunk/cherokee/thread.c

@@ -983 +983 @@
-                        
-                        /* If it is an error, and the connection has not a handler to manage
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                        
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-
-                                /* At this point, two different things might happen:
-                                 * - It has got a common handler like handler_redir
-                                 * - It has got an error handler like handler_error
-                                 */
-                                conn->phase = phase_init;
-                                break;
-                        }
-