Changeset 493

Show
Ignore:
Timestamp:
12/04/06 18:20:40 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r492 r493  
    112006-12-04  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/version.h, cherokee/version.c: New files. Implements 
     4        cherokee_version_add_w_port() and cherokee_version_add(). 
     5 
     6        * cherokee/handler_error.c (build_hardcoded_response_page): Now, 
     7        it uses the new cherokee_version_add_w_port() function. 
     8 
     9        * cherokee/buffer.c (cherokee_buffer_add_version): Removed. 
     10 
     11        * cherokee/buffer.h: cherokee_version_t Removed. 
    212 
    313        * cherokee/config_node.c (cherokee_config_node_read_list): Now it 

  • cherokee/trunk/cherokee/Makefile.am

    r483 r493  
    703703util.h \ 
    704704util.c \ 
     705version.h \ 
     706version.c \ 
    705707buffer.h \ 
    706708buffer.c \ 
    …… 
    875877common.h \ 
    876878util.h \ 
     879version.h \ 
    877880buffer.h\ 
    878881fdpoll.h \ 

  • cherokee/trunk/cherokee/buffer.c

    r455 r493  
    672672 
    673673        return ret_ok; 
    674 } 
    675  
    676  
    677 ret_t  
    678 cherokee_buffer_add_version (cherokee_buffer_t *buf, int port, cherokee_version_t ver) 
    679 { 
    680         ret_t       ret; 
    681         static char port_str[6]; 
    682         static int  port_len = 0; 
    683  
    684         if (port_len == 0) { 
    685                 port_len = snprintf (port_str, 6, "%d", port); 
    686         } 
    687  
    688         switch (ver) { 
    689         case ver_full_html: 
    690                 cherokee_buffer_ensure_size (buf, buf->len + 29 + sizeof(PACKAGE_VERSION) + 6 + port_len + 10); 
    691  
    692                 cherokee_buffer_add_str (buf,  
    693                                          "<address>Cherokee web server " PACKAGE_VERSION " Port "); 
    694                 cherokee_buffer_add (buf, port_str, port_len); 
    695                 cherokee_buffer_add_str (buf, "</address>"); 
    696                 break; 
    697  
    698         case ver_port_html: 
    699                 cherokee_buffer_ensure_size (buf, buf->len + 34 + port_len + 10); 
    700  
    701                 cherokee_buffer_add_str (buf, "<address>Cherokee web server Port "); 
    702                 cherokee_buffer_add (buf, port_str, port_len); 
    703                 cherokee_buffer_add_str (buf, "</address>"); 
    704                 break; 
    705  
    706         default:         
    707                 SHOULDNT_HAPPEN; 
    708         } 
    709  
    710         return ret; 
    711674} 
    712675 

  • cherokee/trunk/cherokee/buffer.h

    r440 r493  
    3838 
    3939CHEROKEE_BEGIN_DECLS 
    40  
    41 typedef enum { 
    42         ver_full_html,    /*!< Eg: <address>Cherokee web server 0.5.0 Port 80</address> */ 
    43         ver_port_html     /*!< Eg: <address>Cherokee web server Port 80</address>       */ 
    44 } cherokee_version_t; 
    4540 
    4641typedef struct { 
    …… 
    116111ret_t cherokee_buffer_add_comma_marks    (cherokee_buffer_t  *buf); 
    117112 
    118 ret_t cherokee_buffer_add_version        (cherokee_buffer_t  *buf, int port, cherokee_version_t ver); 
    119113ret_t cherokee_buffer_print_debug        (cherokee_buffer_t  *buf, int length); 
    120114 

  • cherokee/trunk/cherokee/cherokee.h

    r476 r493  
    3333#include <cherokee/common.h> 
    3434#include <cherokee/util.h> 
     35#include <cherokee/version.h> 
    3536#include <cherokee/buffer.h> 
    3637#include <cherokee/fdpoll.h> 

  • cherokee/trunk/cherokee/handler_dirlist.c

    r482 r493  
    684684                port = srv->port_tls; 
    685685         
    686         switch (srv->server_token) { 
    687         case cherokee_version_product: 
    688                 cherokee_buffer_add_version (&dhdl->server_software, port, ver_full_html); 
    689         case cherokee_version_minor: 
    690         case cherokee_version_minimal: 
    691         case cherokee_version_os: 
    692         case cherokee_version_full: 
    693                 cherokee_buffer_add_version (&dhdl->server_software, port, ver_port_html); 
    694         } 
     686        ret = cherokee_version_add_w_port (&dhdl->server_software, srv->server_token, port); 
     687        if (unlikely (ret != ret_ok)) return ret; 
    695688 
    696689        return ret_ok; 

  • cherokee/trunk/cherokee/handler_error.c

    r476 r493  
    8383build_hardcoded_response_page (cherokee_connection_t *cnt, cherokee_buffer_t *buffer) 
    8484{ 
     85        ret_t              ret; 
    8586        cuint_t            port; 
    8687        cherokee_buffer_t *escaped = NULL; 
    …… 
    178179                port = CONN_SRV(cnt)->port_tls; 
    179180 
    180         if (CONN_SRV(cnt)->server_token <= cherokee_version_product) { 
    181                 cherokee_buffer_add_version (buffer, port, ver_port_html); 
    182         } else { 
    183                 cherokee_buffer_add_version (buffer, port, ver_full_html); 
    184         } 
     181        ret = cherokee_version_add_w_port (buffer, CONN_SRV(cnt)->server_token, port); 
     182        if (unlikely (ret != ret_ok)) return ret; 
     183 
    185184        cherokee_buffer_add_str (buffer, "</body></html>");  
    186185 

  • cherokee/trunk/cherokee/server-protected.h

    r476 r493  
    5656#include "mime.h" 
    5757#include "config_node.h" 
     58#include "version.h" 
    5859 
    5960 

  • cherokee/trunk/cherokee/server.h

    r441 r493  
    3737CHEROKEE_BEGIN_DECLS 
    3838 
    39 typedef enum { 
    40         cherokee_version_product, 
    41         cherokee_version_minor,   
    42         cherokee_version_minimal, 
    43         cherokee_version_os, 
    44         cherokee_version_full 
    45 } cherokee_server_token_t; 
    46  
    4739typedef struct cherokee_server cherokee_server_t; 
    4840typedef void (* cherokee_server_reinit_cb_t) (cherokee_server_t *new_srv); 

  • cherokee/trunk/cherokee/util.c

    r446 r493  
    12681268        return (re == 0) ? ret_ok : ret_error; 
    12691269} 
     1270 

  • cherokee/trunk/cherokee/util.h

    r435 r493  
    5353 
    5454#include <cherokee/buffer.h> 
    55  
    5655 
    5756CHEROKEE_BEGIN_DECLS