Changeset 1799

Show
Ignore:
Timestamp:
08/13/08 16:46:29 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1798 r1799  
    112008-08-13  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * Index: cherokee/Makefile.am, cherokee/connector.c, 
     4        cherokee/connector.h, cherokee/source.c, cherokee/downloader.c, 
     5        cherokee/server-protected.h, cherokee/server.c: The 
     6        cherokee_connector_t class is no longer needed. Removed. 
    27 
    38        * cherokee/main_admin.c (main): Ignore SIGCHLD. We want to be 

  • cherokee/trunk/cherokee/Makefile.am

    r1735 r1799  
    943943bogotime.h \ 
    944944bogotime.c \ 
    945 connector.h \ 
    946 connector.c \ 
    947945cache.h \ 
    948946cache.c 

  • cherokee/trunk/cherokee/downloader.c

    r1657 r1799  
    2929#include "url.h" 
    3030#include "header-protected.h" 
    31 #include "connector.h" 
    3231#include "util.h" 
    3332 
    …… 
    187186connect_to (cherokee_downloader_t *downloader, cherokee_buffer_t *host, cuint_t port, int protocol) 
    188187{ 
    189         ret_t                 ret; 
    190         cherokee_connector_t *connector = NULL; 
    191         cherokee_socket_t    *sock      = &downloader->socket; 
     188        ret_t              ret; 
     189        cherokee_socket_t *sock = &downloader->socket; 
    192190 
    193191        TRACE(ENTRIES, "host=%s port=%d proto=%d\n", host->buf, port, protocol); 
    194  
    195         ret = cherokee_connector_get_default (&connector); 
    196         if (ret != ret_ok) 
    197                 return ret; 
    198192 
    199193        /* Create the socket 
    …… 
    219213        /* Connect to server 
    220214         */ 
    221         ret = cherokee_connector_connect (connector, socket); 
     215        ret = cherokee_socket_connect (socket); 
    222216        TRACE(ENTRIES, "socket=%p ret=%d\n", sock, ret); 
    223217 

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

    r1770 r1799  
    5656#include "config_node.h" 
    5757#include "version.h" 
    58 #include "connector.h" 
    5958 
    6059 
    …… 
    108107        int                        fdlimit_available; 
    109108        int                        fdlimit_per_thread; 
    110  
    111109        cherokee_poll_type_t       fdpoll_method; 
    112         cherokee_connector_t       client_connector; 
    113110 
    114111        /* Connection related 

  • cherokee/trunk/cherokee/server.c

    r1770 r1799  
    313313        cherokee_socket_mrproper (&srv->socket); 
    314314 
    315         cherokee_connector_mrproper (&srv->client_connector); 
    316  
    317315#ifdef HAVE_TLS 
    318316        cherokee_socket_close (&srv->socket_tls); 
    …… 
    10871085                return ret; 
    10881086 
    1089         /* Initialize the client connector 
    1090          */ 
    1091         cherokee_connector_init (&srv->client_connector, 
    1092                                  (srv->thread_num > 2)? srv->thread_num-1 : 1); 
    1093         cherokee_connector_set_default (&srv->client_connector); 
    1094  
    10951087        /* Print the server banner 
    10961088         */ 
    1097         return print_banner (srv); 
     1089        ret = print_banner (srv); 
     1090        if (ret != ret_ok) 
     1091                return ret; 
     1092         
     1093        return ret_ok; 
    10981094} 
    10991095 

  • cherokee/trunk/cherokee/source.c

    r1790 r1799  
    2828#include "resolv_cache.h" 
    2929#include "util.h" 
    30 #include "connector.h" 
    3130 
    3231#define ENTRIES "source,src" 
    …… 
    7271        ret_t                    ret; 
    7372        cherokee_resolv_cache_t *resolv; 
    74         cherokee_connector_t    *connector; 
    75          
    76         ret = cherokee_connector_get_default (&connector); 
    77         if (unlikely (ret!=ret_ok))  
    78                 return ret; 
    7973 
    8074        /* Short path 
    …… 
    128122 
    129123out:     
    130         return cherokee_connector_connect (connector, sock); 
     124        return cherokee_socket_connect (sock); 
    131125} 
    132126