Changeset 1598
- Timestamp:
- 07/02/08 19:58:34 (4 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/cherokee/connection.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r1597 r1598 1 1 2008-07-02 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 3 * cherokee/connection.c (cherokee_connection_create_handler): 4 Clean up. 5 6 * cherokee/connection.c (cherokee_connection_build_local_directory): 7 Do not short the request string when the web directory is /. It 8 means that the Default rule matched. In this way, web_directory 9 will be / and the request will continue starting by slash. 2 10 3 11 * cherokee/handler_cgi.c (manage_child_cgi_process): Adds SIGBUS cherokee/trunk/cherokee/connection.c
r1584 r1598 1176 1176 */ 1177 1177 cherokee_buffer_add_buffer (&conn->request_original, &conn->request); 1178 cherokee_buffer_move_to_begin (&conn->request, conn->web_directory.len); 1178 1179 if (conn->web_directory.len > 1) 1180 cherokee_buffer_move_to_begin (&conn->request, conn->web_directory.len); 1179 1181 1180 1182 if ((conn->request.len >= 2) && (strncmp(conn->request.buf, "//", 2) == 0)) { … … 1690 1692 */ 1691 1693 ret = (config_entry->handler_new_func) ((void **)&conn->handler, conn, config_entry->handler_properties); 1692 if (ret == ret_eagain) return ret_eagain; 1693 if (ret != ret_ok) { 1694 if ((conn->handler == NULL) && (conn->error_code == http_ok)) { 1694 switch (ret) { 1695 case ret_ok: 1696 case ret_eagain: 1697 return ret; 1698 default: 1699 if ((conn->handler == NULL) && 1700 (conn->error_code == http_ok)) 1695 1701 conn->error_code = http_internal_error; 1696 }1697 1702 return ret_error; 1698 1703 } … … 1713 1718 ret = cherokee_header_get_known (&conn->header, header_connection, &ptr, &ptr_len); 1714 1719 if (ret == ret_ok) { 1715 1716 1720 if (strncasecmp (ptr, "close", 5) == 0) { 1717 1721 conn->keepalive = 0;