Changeset 889

Show
Ignore:
Timestamp:
08/10/07 12:01:24 (1 year ago)
Author:
adefacc
Message:

Micro changes / fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r888 r889  
     12007-08-10  A.D.F  <adefacc@tin.it> 
     2 
     3        * cherokee/handler_server_info.c, 
     4          cherokee/handler_admin.c, 
     5          cherokee/handler_cgi_base.c, 
     6          cherokee/handler_file.c, 
     7          cherokee/handler_error.c, 
     8          cherokee/downloader.c, 
     9          cherokee/connection.c 
     10          - cosmetic change, 
     11            use "Content-Length:" instead of "Content-length:"; 
     12 
     13        * cherokee/buffer.c 
     14          - cherokee_buffer_ensure_addlen(), add 1 to required size, 
     15            because it is more correct to consider "addlen" as 
     16            "additional length" instead of "additional size" 
     17            (this is really required because now we have 
     18             cherokee_buffer_ensure_size() so the old semantic of 
     19             cherokee_buffer_ensure_addlen() had to go anyway). 
     20 
    1212007-08-10  A.D.F  <adefacc@tin.it> 
    222 

  • cherokee/trunk/cherokee/buffer.c

    r883 r889  
    571571cherokee_buffer_is_endding (cherokee_buffer_t *buf, char c) 
    572572{ 
    573         if (cherokee_buffer_is_empty(buf)) { 
     573        if (cherokee_buffer_is_empty(buf)) 
    574574                return 0; 
    575         } 
    576575 
    577576        return (buf->buf[buf->len - 1] == c); 
    …… 
    615614                return ret_ok; 
    616615 
    617         return cherokee_buffer_ensure_size (buf, ((size_t)buf->len + addlen)); 
     616        return cherokee_buffer_ensure_size (buf, ((size_t)buf->len + addlen + 1)); 
    618617} 
    619618 

  • cherokee/trunk/cherokee/connection.c

    r874 r889  
    552552 
    553553        if (HANDLER_SUPPORT_MAYBE_LENGTH(conn->handler)) { 
    554                 if (strcasestr (conn->header_buffer.buf, "Content-length: ") == NULL) { 
     554                if (strcasestr (conn->header_buffer.buf, "Content-Length: ") == NULL) { 
    555555                        conn->keepalive = 0; 
    556556                } 
    …… 
    810810        } 
    811811 
    812         /* If this connection has a handler without content-length support 
     812        /* If this connection has a handler without Content-Length support 
    813813         * it has to count the bytes sent 
    814814         */ 

  • cherokee/trunk/cherokee/downloader.c

    r656 r889  
    324324                } 
    325325 
    326                 /* Try to read the "Content-length" response header 
     326                /* Try to read the "Content-Length" response header 
    327327                 */ 
    328328                ret = cherokee_header_has_known (downloader->header, header_content_length); 

  • cherokee/trunk/cherokee/handler_admin.c

    r665 r889  
    188188cherokee_handler_admin_add_headers (cherokee_handler_admin_t *ahdl, cherokee_buffer_t *buffer) 
    189189{ 
    190         cherokee_buffer_add_va (buffer, "Content-length: %lu" CRLF, ahdl->reply.len); 
     190        cherokee_buffer_add_va (buffer, "Content-Length: %lu" CRLF, ahdl->reply.len); 
    191191        return ret_ok; 
    192192} 

  • cherokee/trunk/cherokee/handler_cgi_base.c

    r869 r889  
    303303        } 
    304304 
    305         /* Content-type and Content-lenght (if available)  
     305        /* Content-Type and Content-Lenght (if available)  
    306306         */ 
    307307        cherokee_buffer_clean (tmp); 
    …… 
    730730                } 
    731731 
    732                 else if (strncasecmp ("Content-length: ", begin, 16) == 0) { 
     732                else if (strncasecmp ("Content-Length: ", begin, 16) == 0) { 
    733733                        cherokee_buffer_t tmp = CHEROKEE_BUF_INIT; 
    734734 

  • cherokee/trunk/cherokee/handler_error.c

    r869 r889  
    260260        cherokee_buffer_add_str     (buffer, "Content-Type: text/html"CRLF); 
    261261 
    262         cherokee_buffer_add_str     (buffer, "Content-length: "); 
     262        cherokee_buffer_add_str     (buffer, "Content-Length: "); 
    263263        cherokee_buffer_add_ulong10 (buffer, (culong_t) hdl->content.len); 
    264264        cherokee_buffer_add_str     (buffer, CRLF); 

  • cherokee/trunk/cherokee/handler_file.c

    r874 r889  
    624624 
    625625        } else { 
    626                 /* Can't use Keep-alive w/o "Content-length:", so disable it. 
     626                /* Can't use Keep-alive w/o "Content-Length:", so disable it. 
    627627                 */ 
    628628                conn->keepalive = 0; 

  • cherokee/trunk/cherokee/handler_server_info.c

    r888 r889  
    553553cherokee_handler_server_info_add_headers (cherokee_handler_server_info_t *hdl, cherokee_buffer_t *buffer) 
    554554{ 
    555         cherokee_buffer_add_va (buffer, "Content-length: %d"CRLF, hdl->buffer.len); 
     555        cherokee_buffer_add_va (buffer, "Content-Length: %d"CRLF, hdl->buffer.len); 
    556556 
    557557        switch (hdl->action) {