Changeset 59

Show
Ignore:
Timestamp:
10/21/05 18:46:59 (3 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/ChangeLog

    r58 r59  
     12005-10-21  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * Makefile.am (COMPILATION_TESTS): Added debian_testing.sh and 
     4        debian_testing_chroot.sh to extra dist. 
     5 
     6        * cherokee/Makefile.embedded (OBJS): Fixed. It was not working 
     7        from the changes of 2005-10-19. 
     8 
     9        * cherokee/handler_server_info.c 
     10        (cherokee_handler_server_info_new): It was outdated. I was trying 
     11        to read a wrong structure and hence, it was providing random 
     12        information. Reported by Borja <@softonic.com> 
     13 
    1142005-10-20  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    215 

  • cherokee/Makefile.am

    r33 r59  
    5252$(CONFS) 
    5353 
     54COMPILATION_TESTS = \ 
     55debian_testing.sh \ 
     56debian_testing_chroot.sh 
     57 
     58 
    5459EXTRA_DIST =          \ 
    5560TODO                  \ 
    …… 
    6570$(CONFS_PRE)          \ 
    6671$(man_MANS)           \ 
    67 $(WINDOWS_PORT_FILES) 
     72$(WINDOWS_PORT_FILES) \ 
     73$(COMPILATION_TESTS) 
    6874 
    6975 

  • cherokee/cherokee/Makefile.am

    r56 r59  
    305305# Handler admin 
    306306# 
     307config_common = \ 
     308connection_info.h \ 
     309connection_info.c 
     310 
    307311handler_admin = \ 
    308312handler_admin.c \ 
    309 handler_admin.h 
     313handler_admin.h \ 
     314admin_server.h \ 
     315admin_server.c  
    310316 
    311317libplugin_admin_la_LDFLAGS = $(module_ldflags)   
    312318libplugin_admin_la_SOURCES = $(handler_admin) 
    313 libplugin_admin_la_LIBADD  = -lcherokee-config -lcherokee-client 
     319libplugin_admin_la_LIBADD  = libcherokee-config.la libcherokee-client.la   
    314320 
    315321if STATIC_HANDLER_ADMIN 
    316 static_handler_admin_src = $(handler_admin) 
    317 static_handler_admin_lib = -lcherokee-config 
     322static_handler_admin_src = $(handler_admin) $(config_common) 
    318323else 
    319324dynamic_handler_admin_lib = libplugin_admin.la 
    320325endif 
    321  
    322326 
    323327 
    …… 
    518522 
    519523libcherokee_server_la_LDFLAGS = $(common_ldflags) 
     524libcherokee_server_la_CFLAGS = \ 
     525$(static_validator_htpasswd_flags) 
    520526libcherokee_server_la_LIBADD = \ 
    521527$(TLS_LIBS) \ 
    522528$(PTHREAD_LIBS) \ 
    523529$(PTHREAD_CFLAGS) \ 
    524 $(static_handler_admin_lib) \ 
    525530$(static_validator_pam_lib) \ 
    526531$(static_validator_htpasswd_lib) \ 
    …… 
    650655downloader.c  
    651656 
    652 libcherokee_server_la_CFLAGS = \ 
    653 $(static_validator_htpasswd_flags) 
    654  
    655657libcherokee_server_la_SOURCES = \ 
    656658icons_grammar.y \ 
    …… 
    723725 
    724726libcherokee_config_la_SOURCES = \ 
     727$(config_common) \ 
    725728admin_client.h \ 
    726 admin_client.c \ 
    727 admin_server.h \ 
    728 admin_server.c \ 
    729 connection_info.h \ 
    730 connection_info.c 
     729admin_client.c  
    731730 
    732731 

  • cherokee/cherokee/Makefile.embedded

    r55 r59  
    4949handler_common.o \ 
    5050list_merge_sort.o \ 
     51post.o \ 
    5152nonce.o \ 
    5253typed_table.o \ 
    53 read_config_embedded.o 
    54  
     54read_config_embedded.o  
    5555 
    5656all: u-cherokee 

  • cherokee/cherokee/handler_server_info.c

    r38 r59  
    229229build_modules_table_content_while (const char *key, void *value, void *params[]) 
    230230{ 
    231         int                    *loggers    = (int *) params[2]; 
    232         int                    *handlers   = (int *) params[3]; 
    233         int                    *encoders   = (int *) params[4]; 
    234         int                    *validators = (int *) params[5]; 
    235         int                    *generic    = (int *) params[6]; 
    236         cherokee_module_info_t *mod        = value; 
    237             
     231        int *loggers    = (int *) params[2]; 
     232        int *handlers   = (int *) params[3]; 
     233        int *encoders   = (int *) params[4]; 
     234        int *validators = (int *) params[5]; 
     235        int *generic    = (int *) params[6]; 
     236 
     237        cherokee_module_loader_entry_t *entry = value; 
     238        cherokee_module_info_t         *mod   = entry->info; 
     239 
    238240        if (mod->type & cherokee_logger) { 
    239241                *loggers += 1; 
    …… 
    247249                *generic += 1; 
    248250        } else { 
    249                 SHOULDNT_HAPPEN; 
     251                PRINT_ERROR("Unknown module type (%d)\n", mod->type); 
    250252        } 
    251253 
    …… 
    370372        /* Init 
    371373         */ 
     374        n->just_about = false; 
     375 
    372376        cherokee_buffer_new (&n->buffer); 
    373377        cherokee_buffer_ensure_size (n->buffer, 4*1024); 

  • cherokee/cherokee/module_loader.c

    r55 r59  
    3838#include "buffer.h" 
    3939 
    40  
    41 typedef struct { 
    42         cherokee_module_info_t *info; 
    43         void                   *dlopen_ref; 
    44 } entry_t; 
     40typedef cherokee_module_loader_entry_t entry_t; 
    4541 
    4642 

  • cherokee/cherokee/module_loader.h

    r31 r59  
    3636CHEROKEE_BEGIN_DECLS 
    3737 
     38typedef struct { 
     39        cherokee_module_info_t *info; 
     40        void                   *dlopen_ref; 
     41} cherokee_module_loader_entry_t; 
    3842 
    39 //typedef struct cherokee_module_loader cherokee_module_loader_t; 
    4043typedef struct cherokee_table cherokee_module_loader_t; 
    4144