Changeset 492

Show
Ignore:
Timestamp:
12/04/06 17:39:08 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r491 r492  
    112006-12-04  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/config_node.c (cherokee_config_node_read_list): Now it 
     4        skips whites before each list entry.  "a, b, c" should be "a", "b" 
     5        and "c" instead of "a", " b" and " c" like previously.  
     6 
     7        * cherokee/server.c (configure_server_property): Configuration key 
     8        "mime_file" has been renamed to "mime_files". Now it accepts a 
     9        list fo files rather than a single one. 
    210 
    311        * qa/031-Post+urlencoded2.py, qa/101-HugePost.py, 

  • cherokee/trunk/cherokee.conf.sample.pre

    r481 r492  
    1818server!encoder!gzip!allow = html,html,txt 
    1919server!panic_action = %prefix%/bin/cherokee-panic 
    20 server!mime_file = %sysconfdir%/cherokee/mime.types 
    21 server!mime_file = %sysconfdir%/cherokee/mime.compression.types 
     20server!mime_files = %sysconfdir%/cherokee/mime.types, %sysconfdir%/cherokee/mime.compression.types 
    2221 
    2322# Default virtual server 

  • cherokee/trunk/cherokee/config_node.c

    r474 r492  
    483483 
    484484        for (;;) { 
     485                while ((*ptr == ' ') && (*ptr != '\0')) 
     486                        ptr++; 
     487 
    485488                stop = strchr (ptr, ','); 
    486489                if (stop != NULL) *stop = '\0'; 

  • cherokee/trunk/cherokee/mime.c

    r433 r492  
    2828#include "mime-protected.h" 
    2929#include "util.h" 
     30 
     31#define ENTRIES "mime" 
    3032 
    3133 
    …… 
    120122        cherokee_buffer_t  type = CHEROKEE_BUF_INIT; 
    121123 
     124        TRACE(ENTRIES, "Loading mime file: '%s'\n", filename); 
    122125 
    123126        ret = cherokee_buffer_read_file (&file, filename); 
    …… 
    195198                        cherokee_table_add (&mime->mime_table, ext.buf, entry); 
    196199 
     200                        TRACE(ENTRIES, "Adding mime '%s' -> '%s'\n", ext.buf, type.buf); 
     201 
    197202                        p = tmp; 
    198203                } 

  • cherokee/trunk/cherokee/server.c

    r480 r492  
    12781278 
    12791279static ret_t  
    1280 load_mime_file (cherokee_server_t *srv, cherokee_buffer_t *mime_file) 
    1281 { 
    1282         ret_t ret; 
     1280load_mime_file (char *file, void *data) 
     1281{ 
     1282        ret_t              ret; 
     1283        cherokee_server_t *srv = SRV(data); 
    12831284 
    12841285#ifndef CHEROKEE_EMBEDDED  
    …… 
    12911292        } 
    12921293 
    1293         ret = cherokee_mime_load_mime_types (srv->mime, mime_file->buf); 
     1294        ret = cherokee_mime_load_mime_types (srv->mime, file); 
    12941295        if (ret < ret_ok) { 
    1295                 PRINT_MSG ("Couldn't load MIME configuration file %s\n", mime_file->buf); 
     1296                PRINT_MSG ("Couldn't load MIME configuration file '%s'\n", file); 
    12961297                return ret; 
    12971298        } 
    …… 
    13641365                cherokee_buffer_add_buffer (&srv->pidfile, &conf->val); 
    13651366 
    1366         } else if (equal_buf_str (&conf->key, "mime_file")) { 
    1367                 ret = load_mime_file (srv, &conf->val); 
     1367        } else if (equal_buf_str (&conf->key, "mime_files")) { 
     1368                ret = cherokee_config_node_read_list (conf, NULL, load_mime_file, srv); 
    13681369                if (ret != ret_ok) return ret; 
    13691370