Changeset 446

Show
Ignore:
Timestamp:
11/02/06 16:22:42 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/cherokee/access.c

    r385 r446  
    506506                                re = (! IN6_ARE_ADDR_EQUAL (&SOCKET_ADDR_IPv6(sock)->sin6_addr, &IP_NODE(i)->ip.ip6)); 
    507507 
    508                                 // re = memcmp (&SOCKET_ADDR_IPv6(sock)->sin6_addr, &IP_NODE(i)->ip, 16); 
     508                                /* re = memcmp (&SOCKET_ADDR_IPv6(sock)->sin6_addr, &IP_NODE(i)->ip, 16); */ 
     509 
    509510                                /* 
    510511                                printf ("6 family=%d, ipv6=%d\n", SOCKET_ADDR_IPv6(sock)->sin6_family, ipv6); 

  • cherokee/trunk/cherokee/admin_client.c

    r385 r446  
    125125#warning "Fix this!" 
    126126 
    127 //     ret = cherokee_downloader_set_fdpoll (downloader, admin->poll_ref, true); 
    128 //     if (unlikely (ret != ret_ok)) return ret; 
     127/*     ret = cherokee_downloader_set_fdpoll (downloader, admin->poll_ref, true); */ 
     128/*     if (unlikely (ret != ret_ok)) return ret; */ 
    129129         
    130130        ret = cherokee_downloader_set_url (&admin->downloader, admin->url_ref);  
    …… 
    134134        if (unlikely (ret != ret_ok)) return ret; 
    135135 
    136 //     ret = cherokee_downloader_connect_event (downloader, downloader_event_finish, on_downloader_finish, admin); 
    137 //     if (unlikely (ret != ret_ok)) return ret; 
     136/*     ret = cherokee_downloader_connect_event (downloader, downloader_event_finish, on_downloader_finish, admin); */ 
     137/*     if (unlikely (ret != ret_ok)) return ret; */ 
    138138 
    139139        return ret_ok; 

  • cherokee/trunk/cherokee/avl.c

    r283 r446  
    809809                right = avl_get_successor (node); 
    810810                if (right == tree->root) { 
    811                         // special case, tree->size == 1 
     811                        /* special case, tree->size == 1 */ 
    812812                        *low = i; 
    813813                        *high = i + 1; 
    …… 
    869869                right = avl_get_successor (high_node); 
    870870                if (right == tree->root) { 
    871                         // special case, tree->size == 1 
     871                        /* special case, tree->size == 1 */ 
    872872                        j = i + 1; 
    873873                } else { 

  • cherokee/trunk/cherokee/config_entry.c

    r387 r446  
    149149        } 
    150150 
    151 //     printf ("same_type=%d, overwrite=%d, prio=%d\n", same_type, overwrite, main->priority); 
     151/*     printf ("same_type=%d, overwrite=%d, prio=%d\n", same_type, overwrite, main->priority); */ 
    152152 
    153153        /* If a temporary config_entry inherits from valid entry, it will 

  • cherokee/trunk/cherokee/downloader.c

    r342 r446  
    428428                        ret = cherokee_post_walk_to_fd (downloader->post, downloader->socket.socket, NULL, NULL); 
    429429 
    430 //                     ret = send_post (downloader); 
     430/*                     ret = send_post (downloader); */ 
    431431/*                      ret = downloader_send_buffer (downloader, downloader->post_ref); */ 
    432432                        if (unlikely(ret != ret_ok)) return ret; 

  • cherokee/trunk/cherokee/fcgi_manager.c

    r430 r446  
    100100        } 
    101101 
    102 //    printf ("mgr->conn.id2conn[id].conn %p, mgr->conn.id2conn[id].eof %d -- use=%d\n", 
    103 //              mgr->conn.id2conn[id].conn, mgr->conn.id2conn[id].eof, mgr->conn.len); 
     102/*    printf ("mgr->conn.id2conn[id].conn %p, mgr->conn.id2conn[id].eof %d -- use=%d\n", 
     103        mgr->conn.id2conn[id].conn, mgr->conn.id2conn[id].eof, mgr->conn.len); */ 
    104104} 
    105105 
    …… 
    295295 
    296296        case FCGI_STDOUT: 
    297 //             printf ("READ:STDOUT id=%d gen=%d eof=%d (%s): %d", id, hdl->generation, CGI_BASE(hdl)->got_eof, conn->query_string.buf, len); 
     297/*             printf ("READ:STDOUT id=%d gen=%d eof=%d (%s): %d", id, hdl->generation, CGI_BASE(hdl)->got_eof, conn->query_string.buf, len); */ 
    298298                cherokee_buffer_add (outbuf, data, len); 
    299299                break; 
    …… 
    312312                update_conn_list_lenght (mgr, id); 
    313313 
    314 //             printf ("READ:END id=%d gen=%d", id, hdl->generation); 
     314/*             printf ("READ:END id=%d gen=%d", id, hdl->generation); */ 
    315315                break; 
    316316 
    …… 
    321321go_out: 
    322322        cherokee_buffer_move_to_begin (inbuf, len + FCGI_HEADER_LEN + padding); 
    323 //     printf ("- FCGI quedan %d\n", inbuf->len); 
     323/*     printf ("- FCGI quedan %d\n", inbuf->len); */ 
    324324        return ret_eagain; 
    325325 

  • cherokee/trunk/cherokee/handler.h

    r387 r446  
    5252        hsupport_range            = 1 << 2,    /* Can handle "Range: bytes=" requests     */ 
    5353        hsupport_error            = 1 << 3,    /* It is an error handler                  */ 
    54         hsupport_dont_add_headers = 1 << 4,    /* The server shouldn't add any headers    */ 
     54        hsupport_dont_add_headers = 1 << 4     /* The server shouldn't add any headers    */ 
    5555} cherokee_handler_support_t; 
    5656 

  • cherokee/trunk/cherokee/handler_cgi.c

    r387 r446  
    119119        /* Virtual methods 
    120120         */ 
    121         MODULE(n)->init         = (handler_func_init_t) cherokee_handler_cgi_init; 
     121        MODULE(n)->init         = (module_func_init_t) cherokee_handler_cgi_init; 
    122122        MODULE(n)->free         = (module_func_free_t) cherokee_handler_cgi_free; 
    123123         

  • cherokee/trunk/cherokee/handler_fastcgi.c

    r430 r446  
    4646                cherokee_balancer_free (props->balancer); 
    4747 
    48         // TODO: Free the structure content 
     48        /* TODO: Free the structure content 
     49         */ 
    4950        return cherokee_handler_cgi_base_props_free (PROP_CGI_BASE(props)); 
    5051} 

  • cherokee/trunk/cherokee/handler_fcgi.c

    r430 r446  
    9191        data    = inbuf->buf +  FCGI_HEADER_LEN; 
    9292 
    93 //     printf ("have %d, hdr=%d exp_len=%d pad=%d\n", inbuf->len, FCGI_HEADER_LEN, len, padding); 
     93/*     printf ("have %d, hdr=%d exp_len=%d pad=%d\n", inbuf->len, FCGI_HEADER_LEN, len, padding); */ 
    9494 
    9595        /* Is the package complete? 
    9696         */ 
    9797        if (len + padding > inbuf->len - FCGI_HEADER_LEN) { 
    98 //             printf ("Incomplete: %d < %d\n", len + padding, inbuf->len - FCGI_HEADER_LEN); 
     98/*             printf ("Incomplete: %d < %d\n", len + padding, inbuf->len - FCGI_HEADER_LEN); */ 
    9999                return ret_ok; 
    100100        } 
    …… 
    104104        switch (type) { 
    105105        case FCGI_STDERR:  
    106 //             printf ("READ:STDERR (%d): %s", len, data?data:""); 
     106/*             printf ("READ:STDERR (%d): %s", len, data?data:""); */ 
    107107 
    108108                if (CONN_VSRV(conn)->logger != NULL) { 
    …… 
    117117 
    118118        case FCGI_STDOUT: 
    119 //             printf ("READ:STDOUT eof=%d: %d", CGI_BASE(hdl)->got_eof, len); 
     119/*             printf ("READ:STDOUT eof=%d: %d", CGI_BASE(hdl)->got_eof, len); */ 
    120120                cherokee_buffer_add (outbuf, data, len); 
    121121                break; 
    …… 
    130130 
    131131                HDL_CGI_BASE(hdl)->got_eof = true; 
    132 //             printf ("READ:END"); 
     132/*             printf ("READ:END"); */ 
    133133                break; 
    134134 
    …… 
    138138 
    139139        cherokee_buffer_move_to_begin (inbuf, len + FCGI_HEADER_LEN + padding); 
    140 //     printf ("- FCGI quedan %d\n", inbuf->len); 
     140/*     printf ("- FCGI quedan %d\n", inbuf->len); */ 
    141141        return ret_eagain; 
    142142} 

  • cherokee/trunk/cherokee/handler_scgi.c

    r429 r446  
    4444                cherokee_balancer_free (props->balancer); 
    4545 
    46         // TODO: Free scgi_env_ref 
     46        /* TODO: Free scgi_env_ref 
     47         */ 
    4748 
    4849        return cherokee_handler_cgi_base_props_free (PROP_CGI_BASE(props)); 

  • cherokee/trunk/cherokee/module.h

    r387 r446  
    5151/* Callback function prototipes 
    5252 */ 
     53typedef void   * module_func_init_t; 
    5354typedef ret_t (* module_func_new_t)       (void *); 
    5455typedef ret_t (* module_func_free_t)      (void *); 

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

    r441 r446  
    171171         */ 
    172172        cherokee_config_node_t     config; 
    173 //      char                      *config_file; 
    174173        char                      *icons_file; 
    175174 

  • cherokee/trunk/cherokee/socket.c

    r429 r446  
    214214        cherokee_socket_t *socket = SOCKET(ptr); 
    215215 
    216         // printf ("db::retrieve\n"); 
     216        /* printf ("db::retrieve\n"); */ 
    217217 
    218218        if (unlikely (socket->vserver_ref == NULL)) { 
    …… 
    239239        cherokee_socket_t *socket = SOCKET(ptr); 
    240240 
    241         // printf ("db::remove\n"); 
     241        /* printf ("db::remove\n"); */ 
    242242 
    243243        if (unlikely (socket->vserver_ref == NULL)) { 
    …… 
    247247 
    248248        cache = &socket->vserver_ref->session_cache; 
    249 //     ret = cherokee_session_cache_del (cache, key.data, key.size); 
     249/*     ret = cherokee_session_cache_del (cache, key.data, key.size); */ 
    250250 
    251251        ret = cherokee_table_del (cache, (char *)key.data, NULL);        
    …… 
    263263        cherokee_table_t  *cache; 
    264264        cherokee_socket_t *socket = SOCKET(ptr); 
    265         // printf ("db::store\n"); 
     265 
     266        /* printf ("db::store\n"); */ 
    266267 
    267268        if (socket->vserver_ref == NULL) { 
    …… 
    277278        memcpy (n, &data, sizeof (gnutls_datum)); 
    278279 
    279 //      ret = cherokee_session_cache_add (cache, key.data, key.size, data.data, data.size); 
    280 //      cherokee_session_cache_add (cache, key 
     280/*      ret = cherokee_session_cache_add (cache, key.data, key.size, data.data, data.size); 
     281        cherokee_session_cache_add (cache, key */ 
     282 
    281283        ret = cherokee_table_add (cache, (char *)key.data, n); 
    282284 

  • cherokee/trunk/cherokee/table.c

    r433 r446  
    3434equal (void *avl_param, void *key, void *val) 
    3535{ 
    36 //     printf ("equal (%s, %s) = %d\n", key, val, strcmp((const char *)key, (const char *)val)); 
     36/*     printf ("equal (%s, %s) = %d\n", key, val, strcmp((const char *)key, (const char *)val)); */ 
    3737        return strcmp((const char *)key, (const char *)val); 
    3838} 
    …… 
    195195foreach_wrapper (void *key, void *val, void *iter_arg) 
    196196{ 
    197         ((cherokee_table_foreach_func_t)iter_arg) (key, val); 
     197        cherokee_table_foreach_func_t func = (cherokee_table_foreach_func_t)iter_arg; 
     198 
     199        func (key, val); 
    198200        return 0; 
    199201} 

  • cherokee/trunk/cherokee/thread.c

    r445 r446  
    15941594        int                     re; 
    15951595        ret_t                   ret; 
    1596 //      int                     unlock2 = 0; 
    15971596        int                     socket1; 
    15981597        int                     socket2; 
    …… 
    18961895                cherokee_fdpoll_del (thd->fdpoll, conn->polling_fd); 
    18971896 
    1898 //     printf ("- reactive_conn_from_polling %p, multiple=%d del=%d\n", conn, conn->polling_multiple, del); 
     1897/*     printf ("- reactive_conn_from_polling %p, multiple=%d del=%d\n", conn, conn->polling_multiple, del); */ 
    18991898 
    19001899        cherokee_fdpoll_add (thd->fdpoll, socket->socket, socket->status); 
    …… 
    19201919                add_fd = check_addition_multiple_fd (thd, fd); 
    19211920 
    1922 //     printf ("+ move_connection_to_polling %p, multiple=%d add=%d fd=%d\n", conn, multiple, add_fd, fd); 
     1921/*     printf ("+ move_connection_to_polling %p, multiple=%d add=%d fd=%d\n", conn, multiple, add_fd, fd); */ 
    19231922         
    19241923        /* Remove the connection file descriptor and add the new one 

  • cherokee/trunk/cherokee/util.c

    r444 r446  
    12151215        } 
    12161216 
    1217         // TODO: Duplicate char **tmp->gr_mem 
     1217        /* TODO: Duplicate char **tmp->gr_mem 
     1218         */ 
    12181219 
    12191220        CHEROKEE_MUTEX_UNLOCK (&__global_getgrnam_mutex);