Changeset 527

Timestamp:

12/19/06 11:50:38 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/buffer.c (modified) (12 diffs)
• cherokee/trunk/cherokee/buffer.h (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (10 diffs)
• cherokee/trunk/cherokee/handler_file.c (modified) (8 diffs)
• cherokee/trunk/cherokee/server.c (modified) (2 diffs)
• cherokee/trunk/cherokee/util.c (modified) (3 diffs)
• cherokee/trunk/cherokee/util.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2006-12-19  A.D.F  <adefacc@tin.it>
+
+        * cherokee/buffer.h:
+        - new function prototypes cherokee_buffer_add_*long*().
+
+        * cherokee/buffer.c:
+        - changed value of REALLOC_EXTRA_SIZE
+          from 0 to 16;
+        - added new fast formatting function prototypes for numbers
+          (nice to have as a counterpart of string copies):
+          - cherokee_buffer_add_long10();
+          - cherokee_buffer_add_ulong10();
+          - cherokee_buffer_add_ullong10();
+          - cherokee_buffer_add_ulong16();
+          - cherokee_buffer_add_ullong16();
+        - reverted your last change in
+          cherokee_buffer_read_from_fd() PRINT_ERROR(...FMT_OFFSET...)
+          because size_t is not an off_t
+          (in most systems size_t is always an unsigned int
+           or even an uint32_t);
+
+              NOTE: I guess that, sooner or later,
+              we will have to change the type of len and size
+              fields of cherokee_buffer_t, from int to size_t
+              (lot of code to review, maybe it's a 0.7 thing).
+
+        * cherokee/util.h:
+        - removed references to cherokee_weekdays[] and
+          cherokee_months[];
+
+        * cherokee/util.c:
+        - removed arrays cherokee_weekdays[] and
+          cherokee_months[] (see dtm.c);
+        - minor space reformatting;
+
+        * cherokee/server.c:
+        - replaced cherokee_weekdays[] and cherokee_months[]
+          with the equivalent cherokee_dtm_wday_name()
+          and cherokee_dtm_month_name();
+
+        * cherokee/connection.c:
+        - added a call to cherokee_buffer_ensure_size(header_buffer, 384)
+          before the call to "add_headers" function callback;
+        - added a few other cherokee_buffer_ensure_size() and
+          cherokee_buffer_ensure_addlen();
+
+        * cherokee/handler_file.c:
+        - replaced Etag: with ETag:;
+        - added a call to cherokee_dtm_gmttm2str();
+        - replaced a few simple cherokee_buffer_add_va()
+          with single calls to cherokee_buffer_add*().
+
-2006-12-17  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/buffer.c

@@ -42 +42 @@
-
-
-
-
+
+
+
+
-
-
@@ -144 +146 @@
-
-
+static ret_t
+realloc_inc_bufsize (cherokee_buffer_t *buf, size_t incsize)
+{
+        char *pbuf;
+        size_t newsize = buf->size + incsize + REALLOC_EXTRA_SIZE + 1;
+
+        pbuf = (char *) realloc(buf->buf, newsize);
+        if (unlikely (pbuf == NULL)) 
+                return ret_nomem;
+        buf->buf = pbuf;
+        buf->size = (int) newsize;
+
+        return ret_ok;
+}
+
+
+static ret_t
+realloc_new_bufsize (cherokee_buffer_t *buf, size_t newsize)
+{
+        char *pbuf;
+        newsize += REALLOC_EXTRA_SIZE + 1;
+
+        pbuf = (char *) realloc(buf->buf, newsize);
+        if (unlikely (pbuf == NULL)) 
+                return ret_nomem;
+        buf->buf = pbuf;
+        buf->size = (int) newsize;
+
+        return ret_ok;
+}
+
+
-ret_t
-cherokee_buffer_add (cherokee_buffer_t *buf, char *txt, size_t size)
@@ -155 +189 @@
-         */
-        if (free < (size+1)) {
-
-
-
-
+
-                        return ret_nomem;
-                buf->buf = pbuf;
-                buf->size = newsize;
-        }
-
@@ -182 +211 @@
-
-
+ret_t
+cherokee_buffer_add_long10 (cherokee_buffer_t *buf, clong_t lNum)
+{
+        unsigned long   ulNum = (unsigned long) lNum;
+        uint    flgNeg = 0;
+        int     newlen = 0;
+        size_t  i = (IOS_NUMBUF - 1);
+        char    szOutBuf[IOS_NUMBUF];
+
+        if (lNum < 0L) {
+                flgNeg = 1;
+                ulNum = -ulNum;
+        }
+
+        szOutBuf[i] = '\0';
+
+        /* Convert number to string
+         */
+        do {
+                szOutBuf[--i] = (char) ((ulNum % 10) + '0');
+        }
+        while ((ulNum /= 10) != 0);
+
+        /* Set sign in any case
+        */
+        szOutBuf[--i] = '-';
+        i += (flgNeg ^ 1);
+
+        /* Verify free space in buffer and if needed then enlarge it.
+        */
+        newlen = buf->len + (int) ((IOS_NUMBUF - 1) - i);
+        if (unlikely( newlen >= buf->size )) {
+                if (unlikely (realloc_new_bufsize(buf, newlen)) != ret_ok)
+                        return ret_nomem;
+        }
+
+        /* Copy including '\0'
+         */
+        strcpy (buf->buf + buf->len, &szOutBuf[i]);
+
+        buf->len = newlen;
+
+        return ret_ok;
+}
+
+
+ret_t
+cherokee_buffer_add_ulong10 (cherokee_buffer_t *buf, culong_t culNum)
+{
+        unsigned long ulNum = culNum;
+        int     newlen = 0;
+        size_t  i = (IOS_NUMBUF - 1);
+        char    szOutBuf[IOS_NUMBUF];
+
+        szOutBuf[i] = '\0';
+
+        /* Convert number to string
+         */
+        do {
+                szOutBuf[--i] = (char) ((ulNum % 10) + '0');
+        }
+        while ((ulNum /= 10) != 0);
+
+        /* Verify free space in buffer and if needed then enlarge it.
+        */
+        newlen = buf->len + (int) ((IOS_NUMBUF - 1) - i);
+        if (unlikely( newlen >= buf->size )) {
+                if (unlikely (realloc_new_bufsize(buf, newlen)) != ret_ok)
+                        return ret_nomem;
+        }
+
+        /* Copy including '\0'
+         */
+        strcpy (buf->buf + buf->len, &szOutBuf[i]);
+
+        buf->len = newlen;
+
+        return ret_ok;
+}
+
+
+ret_t
+cherokee_buffer_add_ullong10 (cherokee_buffer_t *buf, cullong_t culNum)
+{
+        unsigned long long ulNum = culNum;
+        int     newlen = 0;
+        size_t  i = (IOS_NUMBUF - 1);
+        char    szOutBuf[IOS_NUMBUF];
+
+        szOutBuf[i] = '\0';
+
+        /* Convert number to string
+         */
+        do {
+                szOutBuf[--i] = (char) ((ulNum % 10) + '0');
+        }
+        while ((ulNum /= 10) != 0);
+
+        /* Verify free space in buffer and if needed then enlarge it.
+        */
+        newlen = buf->len + (int) ((IOS_NUMBUF - 1) - i);
+        if (unlikely( newlen >= buf->size )) {
+                if (unlikely (realloc_new_bufsize(buf, newlen)) != ret_ok)
+                        return ret_nomem;
+        }
+
+        /* Copy including '\0'
+         */
+        strcpy (buf->buf + buf->len, &szOutBuf[i]);
+
+        buf->len = newlen;
+
+        return ret_ok;
+}
+
+
+/*
+** Add a number in hexadecimal format to (buf).
+*/
+ret_t
+cherokee_buffer_add_ulong16 (cherokee_buffer_t *buf, culong_t culNum)
+{
+        unsigned long ulNum = culNum;
+        size_t  i = (IOS_NUMBUF - 1);
+        int     ival = 0;
+        int     newlen = 0;
+        char    szOutBuf[IOS_NUMBUF];
+
+        szOutBuf[i] = '\0';
+
+        /* Convert number to string
+         */
+        do {
+                ival = (int) (ulNum & 0xF);
+                szOutBuf[--i] = (char) TO_HEX(ival);
+        }
+        while ((ulNum >>= 4) != 0);
+
+        /* Verify free space in buffer and if needed then enlarge it.
+        */
+        newlen = buf->len + (int) ((IOS_NUMBUF - 1) - i);
+        if (unlikely( newlen >= buf->size )) {
+                if (unlikely (realloc_new_bufsize(buf, newlen)) != ret_ok)
+                        return ret_nomem;
+        }
+
+        /* Copy including '\0'
+         */
+        strcpy (buf->buf + buf->len, &szOutBuf[i]);
+
+        buf->len = newlen;
+
+        return ret_ok;
+}
+
+
+/*
+** Add a number in hexadecimal format to (buf).
+*/
+ret_t
+cherokee_buffer_add_ullong16 (cherokee_buffer_t *buf, cullong_t culNum)
+{
+        unsigned long long ulNum = culNum;
+        size_t  i = (IOS_NUMBUF - 1);
+        int     ival = 0;
+        int     newlen = 0;
+        char    szOutBuf[IOS_NUMBUF];
+
+        szOutBuf[i] = '\0';
+
+        /* Convert number to string
+         */
+        do {
+                ival = (int) (ulNum & 0xF);
+                szOutBuf[--i] = (char) TO_HEX(ival);
+        }
+        while ((ulNum >>= 4) != 0);
+
+        /* Verify free space in buffer and if needed then enlarge it.
+        */
+        newlen = buf->len + (int) ((IOS_NUMBUF - 1) - i);
+        if (unlikely( newlen >= buf->size )) {
+                if (unlikely (realloc_new_bufsize(buf, newlen)) != ret_ok)
+                        return ret_nomem;
+        }
+
+        /* Copy including '\0'
+         */
+        strcpy (buf->buf + buf->len, &szOutBuf[i]);
+
+        buf->len = newlen;
+
+        return ret_ok;
+}
+
+
-ret_t 
-cherokee_buffer_add_va_fixed (cherokee_buffer_t  *buf, char *format, ...)
@@ -189 +414 @@
-
-        va_start (ap, format);
-
+ 
-        va_end (ap);
-
@@ -212 +437 @@
-        cherokee_buffer_ensure_size (buf, buf->len + estimated_length + 2);
-
-
+ 
-        
-#if 0
@@ -253 +478 @@
-         */
-        if (free < (num+1)) {
-
-
-
-
+
-                        return ret_nomem;
-                buf->buf = pbuf;
-                buf->size = newsize;
-        }
-
@@ -279 +499 @@
-         */
-        if (free < (size+1)) {
-
-
-
-
+
-                        return ret_nomem;
-                buf->buf = pbuf;
-                buf->size = newsize;
-        }
-
@@ -334 +549 @@
-
-
+/*
+ * Ensure there is enough (addlen) free space left in the buffer.
+ */
-ret_t
-cherokee_buffer_ensure_addlen (cherokee_buffer_t *buf, size_t addlen)
-{
-        if (addlen < 0)
-                return ret_error;
-
-        if (buf->len + addlen < buf->size)
-                return ret_ok;
@@ -609 +824 @@
-                }
-
-" FMT_OFFSET "
+%u
-                return ret_error;
-        }
@@ -1028 +1243 @@
-                int tmp;
-
-digest[i] >> 4) & 0xf
+(digest[i] >> 4) & 0xf)
-                buf->buf[i*2] = TO_HEX(tmp);
-
-digest[i] & 0xf
+(digest[i] & 0xf)
-                buf->buf[(i*2)+1] = TO_HEX(tmp);
-        }
@@ -1085 +1300 @@
-        cherokee_buffer_t encoded = CHEROKEE_BUF_INIT;
-
-
+ 
-
-        cherokee_buffer_encode_sha1 (buf, &encoded);

cherokee/trunk/cherokee/buffer.h

@@ -64 +64 @@
-
-ret_t cherokee_buffer_add                (cherokee_buffer_t  *buf, char *txt, size_t size);
+ret_t cherokee_buffer_add_long10         (cherokee_buffer_t  *buf, clong_t lNum);
+ret_t cherokee_buffer_add_ulong10        (cherokee_buffer_t  *buf, culong_t ulNum);
+ret_t cherokee_buffer_add_ullong10       (cherokee_buffer_t  *buf, cullong_t ulNum);
+ret_t cherokee_buffer_add_ulong16        (cherokee_buffer_t  *buf, culong_t ulNum);
+ret_t cherokee_buffer_add_ullong16       (cherokee_buffer_t  *buf, cullong_t ulNum);
-ret_t cherokee_buffer_add_va             (cherokee_buffer_t  *buf, char *format, ...);
-ret_t cherokee_buffer_add_va_fixed       (cherokee_buffer_t  *buf, char *format, ...);

cherokee/trunk/cherokee/connection.c

@@ -265 +265 @@
-        cherokee_buffer_escape_set_ref (conn->request_escape, &conn->request);
-
+#ifdef CHEROKEE_EMBEDDED
-        cherokee_buffer_mrproper (&conn->request_original);
+#else
+        cherokee_buffer_clean (&conn->request_original);
+#endif
-        cherokee_buffer_mrproper (&conn->encoder_buffer);
-
@@ -413 +417 @@
-         */
-        if (conn->auth_type & http_auth_basic) {
-size
+addlen
-                cherokee_buffer_add_str (buffer, "WWW-Authenticate: Basic realm=\"");
-                cherokee_buffer_add_buffer (buffer, conn->realm_ref);
@@ -426 +430 @@
-                /* Realm
-                 */
-size
+addlen
-                cherokee_buffer_add_str (buffer, "WWW-Authenticate: Digest realm=\"");
-                cherokee_buffer_add_buffer (buffer, conn->realm_ref);
@@ -449 +453 @@
-build_response_header (cherokee_connection_t *conn, cherokee_buffer_t *buffer)
-{       
-
+.
-         */
-        cherokee_buffer_clean (buffer);
@@ -499 +503 @@
-        /* Authentication
-         */
-
-
+
-                build_response_header__authenticate (conn, buffer);
-        }
@@ -540 +543 @@
-        /* Try to get the headers from the handler
-         */
+        cherokee_buffer_ensure_size (&(conn->header_buffer), 384);
-        ret = cherokee_handler_add_headers (conn->handler, &conn->header_buffer);
-        switch (ret) {
@@ -560 +564 @@
-                }
-        }
-
+
-        /* Add the server headers       
-         */
@@ -1543 +1547 @@
-            (strcmp (conn->request.buf, conn->web_directory.buf) == 0))
-        {
-1
+4
-                cherokee_buffer_add_buffer (&conn->redirect, &conn->request);
-                cherokee_buffer_add (&conn->redirect, "/", 1);
@@ -1857 +1861 @@
-               conn->local_directory.buf);
-
-, have a look at the
-handler to see if
+
+then verify whether the handler
-         */
-        if ((HANDLER_SUPPORT_LENGTH(conn->handler) == 0) && 
@@ -1864 +1868 @@
-                conn->keepalive = 0;
-        }
-
-t
+
+
-         */
-        cherokee_buffer_ensure_size (&conn->buffer, DEFAULT_READ_SIZE+1);

cherokee/trunk/cherokee/handler_file.c

@@ -166 +166 @@
-
-                req_time = cherokee_dtm_str2time (header);                      
-req_time == -1
+unlikely (req_time == DTM_TIME_EVAL)
-                        cherokee_logger_write_string (
-                                CONN_VSRV(conn)->logger, 
-                                "Warning: Unparseable time '%s'",
-                                header);
-
-
-
-
+
+
-                        return ret_ok;
-                }
+                /* restore end of line */
+                *end = tmp;
-                
-                /* The file is cached in the client
@@ -198 +198 @@
-                int    tmp_len;
-                CHEROKEE_TEMP(tmp,100);
-
+
-                has_etag = true;
-
-
+
+
+
-
-                if ((header_len == tmp_len) && 
-
-
+
-                        not_modified_etag = true;
-                }
@@ -237 +237 @@
-                
-                req_time = cherokee_dtm_str2time (header);                      
-req_time == -1
+unlikely (req_time == DTM_TIME_EVAL)
-                        cherokee_logger_write_string (
-                                CONN_VSRV(conn)->logger, 
-                                "Warning: Unparseable time '%s'",
-                                header);
+                        *end = tmp;
+                        return ret_ok;
-                }
-                *end = tmp;
-                
-                if (req_time == -1) {
-                        return ret_ok;
-                }
-
-                /* If the entity tag given in the If-Range header
@@ -544 +542 @@
-{
-        ret_t                  ret;
-
-
+
+
+
+
-        cherokee_connection_t *conn         = HANDLER_CONN(fhdl);
-
-tag
+Tag:
-         */
-        if (conn->header.version >= http_version_11) { 
-t
+T
-        }
-
@@ -558 +558 @@
-        cherokee_gmtime (&fhdl->info->st_mtime, &modified_tm);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-#ifndef CHEROKEE_EMBEDDED
@@ -583 +579 @@
-                ret = cherokee_mime_entry_get_maxage (fhdl->mime, &maxage);             
-                if (ret == ret_ok) {
-
+
+
+
-                }
-        }
@@ -601 +599 @@
-        /* We stat()'ed the file in the handler constructor
-         */
-
-
-
+content_
+content_
+content_
-
-        if (conn->encoder == NULL) {
@@ -614 +612 @@
-                                                fhdl->info->st_size);
-                }
-
-
+
+content_
-
-        } else {
-
+ disable it.
-                 */
-                conn->keepalive = 0;

cherokee/trunk/cherokee/server.c

@@ -80 +80 @@
-#include "mime.h"
-#include "util.h"
+#include "dtm.h"
-#include "fdpoll.h"
-#include "fdpoll-protected.h"
@@ -1095 +1096 @@
-        cherokee_buffer_clean (&srv->bogo_now_string);
-        cherokee_buffer_add_va_fixed (&srv->bogo_now_string,
-      
-                             cherokee_weekdays[srv->bogo_now_tm.tm_wday], 
-                       
-                             cherokee_months[srv->bogo_now_tm.tm_mon], 
-                       
-                       
-                       
-                       
-                       
+
+            cherokee_dtm_wday_name(srv->bogo_now_tm.tm_wday),
+      
+            cherokee_dtm_month_name(srv->bogo_now_tm.tm_mon),
+      
+      
+      
+      
+      
-
-        CHEROKEE_RWLOCK_UNLOCK (&srv->bogo_now_mutex);      /* 2.- release */

cherokee/trunk/cherokee/util.c

@@ -85 +85 @@
-#define ENTRIES "util"
-
-
-const char *cherokee_version    = PACKAGE_VERSION;
-const char *cherokee_months[]   = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
-                                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-const char *cherokee_weekdays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-
-
@@ -548 +544 @@
-
-
-      
-   
+
+    
-                ul /= base; \
-                len++;      \
-        } while (ul > 0);   \
-;
+
-
-
@@ -571 +567 @@
-                case 's':
-                        p = va_arg(ap, char *);
-? p
+ ? p 
-                        break;
-                case 'd':

cherokee/trunk/cherokee/util.h

@@ -66 +66 @@
-/* Some global information
- */
-const extern char *cherokee_months[]; 
-const extern char *cherokee_weekdays[]; 
-
-/* System