Changeset 435

Timestamp:

10/24/06 11:25:47 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/buffer.c (modified) (1 diff)
• cherokee/trunk/cherokee/exts_table.c (modified) (2 diffs)
• cherokee/trunk/cherokee/util.c (modified) (1 diff)
• cherokee/trunk/cherokee/util.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2006-10-24  A.D.F  <adefacc@tin.it>
+
+        * cherokee/buffer.c (cherokee_buffer_decode): change
+          cherokee_buffer_decode() in order to speed up it and to avoid to
+          use original BSD (Jeff Poskanzer) source code.
+
+2006-10-24  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/util.h, cherokee/util.c (cherokee_hexit): Removed.
+
-2006-10-21  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/buffer.c

@@ -351 +351 @@
-
-
+/*
+ * Decode a string that may have encoded characters %xx
+ * where xx is the hexadecimal number corresponding
+ * to the character ascii value.
+ */
-ret_t
-cherokee_buffer_decode (cherokee_buffer_t *buffer)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (buffer->buf == NULL) {
-                return ret_error;
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                /* Replace null bytes (%00) with
-                                 * spaces, to prevent attacks
-                                 */
-to
+ptgt
-                        } else {
-to = cherokee_hexit(from[1]) * 16 + cherokee_hexit(from
+ptgt = hex2dec_m(psrc[1]) * 16 + hex2dec_m(psrc
-                        }
-
-from
-buffer->len
+psrc
+len 
-                } else {
-to = *from
+ptgt = *psrc
-                }
-        }
-
-
-
-
+
+
+
+
+
+
+
-
-ret_t 

cherokee/trunk/cherokee/exts_table.c

@@ -62 +62 @@
-        if (dot == NULL) return ret_not_found;
-
-        printf ("GET0: et %p table %p ext %s\n", et, &et->table, dot+1);
-        ret = cherokee_table_get (&et->table, dot+1, (void **)&entry);
-        printf ("GET1: et %p table %p ext %s: %d\n", et, &et->table, dot+1, ret);
-        if (ret != ret_ok) return ret;
-
@@ -93 +91 @@
-         * plugin entry object.
-         */
-printf
+TRACE
-        return cherokee_table_add (&et->table, ext, plugin_entry);
-}

cherokee/trunk/cherokee/util.c

@@ -90 +90 @@
-                                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-const char *cherokee_weekdays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-
-
-
-int
-cherokee_hexit (char c)
-{
-        if ( c >= '0' && c <= '9' )
-                return c - '0';
-        if ( c >= 'a' && c <= 'f' )
-                return c - 'a' + 10;
-        if ( c >= 'A' && c <= 'F' )
-                return c - 'A' + 10;
-
-        /* shouldn't happen, we're guarded by isxdigit() */
-        return 0;           
-}
-
-

cherokee/trunk/cherokee/util.h

@@ -76 +76 @@
-/* String management functions
- */
-int     cherokee_hexit              (char c);
-int     cherokee_isbigendian        (void);
-char   *cherokee_min_str            (char *s1, char *s2);