Changeset 358

Timestamp:

08/25/06 18:39:42 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/cget/Makefile.am (modified) (1 diff)
• cherokee/trunk/cherokee/handler_error.c (modified) (1 diff)
• cherokee/trunk/cherokee/handler_file.c (modified) (5 diffs)
• cherokee/trunk/cherokee/header.c (modified) (2 diffs)
• cherokee/trunk/cherokee/server.c (modified) (1 diff)

cherokee/trunk/cget/Makefile.am

@@ -1 @@
-bench
+cget
-
-INCLUDES = \

cherokee/trunk/cherokee/handler_error.c

@@ -208 +208 @@
-        }
-
+        /* "304 Not Modified" responses are managed by the individuals
+         * handler, however this test ensures that it'll never send
+         * wrong and unrelated headers in case that a 304 response is
+         * managed by this handler. They should only include the
+         * Last-Modified, ETag, Expires and Cache-Control headers.
+         */
+        if (conn->error_code == http_not_modified)
+                return ret_ok;
+
-        /* Usual headers
-         */

cherokee/trunk/cherokee/handler_file.c

@@ -336 +336 @@
-cherokee_handler_file_init (cherokee_handler_file_t *n)
-{
-
-
+
-        cherokee_boolean_t        use_io   = false;
-        cherokee_iocache_entry_t *io_entry = NULL;
@@ -361 +360 @@
-                return ret_error;
-        }
+
+        /* Look for the mime type
+         */
+#ifndef CHEROKEE_EMBEDDED
+        if (srv->mime != NULL) {
+                ext = strrchr (conn->request.buf, '.');
+                if (ext != NULL) {
+                        ret = cherokee_mime_get_by_suffix (srv->mime, ext+1, &n->mime);
+                }
+        }
+#endif
-
-        /* Is it cached on the client?
@@ -464 +474 @@
-        }
-
-        /* Look for the mime type
-         */
-#ifndef CHEROKEE_EMBEDDED
-        if (srv->mime != NULL) {
-                ext = strrchr (conn->request.buf, '.');
-                if (ext != NULL) {
-                        ret = cherokee_mime_get_by_suffix (srv->mime, ext+1, &n->mime);
-                }
-        }
-#endif
-
-        /* Maybe use sendfile
-         */
@@ -526 +525 @@
-                                modified_tm.tm_sec);
-
+#ifndef CHEROKEE_EMBEDDED
+        /* Add MIME related headers: 
+         * "Content-Type:" and "Cache-Control: max-age="
+         */
+        if (fhdl->mime != NULL) {
+                cherokee_buffer_t *mime;
+                cuint_t            maxage;
+                
+                cherokee_mime_entry_get_type (fhdl->mime, &mime);
+                cherokee_buffer_add_str (buffer, "Content-Type: ");
+                cherokee_buffer_add_buffer (buffer, mime);
+                cherokee_buffer_add_str (buffer, CRLF);
+                
+                ret = cherokee_mime_entry_get_maxage (fhdl->mime, &maxage);             
+                if (ret == ret_ok) {
+                        cherokee_buffer_add_va (buffer, "Cache-Control: max-age=%u"CRLF, maxage);
+                }
+        }
+#endif
+
-        /* If it's replying "304 Not Modified", we're done here
-         */
-        if (fhdl->not_modified) {
-                cherokee_buffer_add_str (buffer, "Content-Length: 0" CRLF);
-
-                /* The handler will manage this special reply
-                 */
@@ -563 +580 @@
-                conn->keepalive = 0;
-        }
-
-        /* Add MIME related headers: 
-         * "Content-Type:" and "Cache-Control: max-age="
-         */
-#ifndef CHEROKEE_EMBEDDED
-        if (fhdl->mime != NULL) {
-                cherokee_buffer_t *mime;
-                cuint_t            maxage;
-
-                cherokee_mime_entry_get_type (fhdl->mime, &mime);
-                cherokee_buffer_add_str (buffer, "Content-Type: ");
-                cherokee_buffer_add_buffer (buffer, mime);
-                cherokee_buffer_add_str (buffer, CRLF);
-
-                ret = cherokee_mime_entry_get_maxage (fhdl->mime, &maxage);             
-                if (ret == ret_ok) {
-                        cherokee_buffer_add_va (buffer, "Cache-Control: max-age=%d"CRLF, maxage);
-                }
-        }
-#endif
-
-        return ret_ok;

cherokee/trunk/cherokee/header.c

@@ -904 +904 @@
-        }
-
-        if (unlikely (tail_len < 0)) {
-                /* Bad parameter value 
-                 */
-                return ret_error;
-        }
-
-        if ((crlf_len > 0) && (crlf_len < (size_t) buffer->len)) {
-                /* Found heading CRLFs and their length is less than
@@ -926 +920 @@
-        }
-
+        if (unlikely (tail_len < 0)) {
+                /* Bad parameter value 
+                 */
+                return ret_error;
+        }
+
-        /* Look for the starting point
-         */

cherokee/trunk/cherokee/server.c

@@ -1352 +1352 @@
-                srv->listen_queue = atoi (conf->val.buf);
-
+        } else if (equal_buf_str (&conf->key, "thread_number")) {
+                srv->thread_num = atoi (conf->val.buf);
+
-        } else if (equal_buf_str (&conf->key, "sendfile_min")) {
-                srv->sendfile.min = atoi (conf->val.buf);