Changeset 1887

Show
Ignore:
Timestamp:
08/20/08 23:43:13 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1885 r1887  
    112008-08-20  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/handler_custom_error.c, configure.in, 
     4        cherokee/handler_custom_error.h, cherokee/Makefile.am, 
     5        admin/ModuleCustomError.py, admin/consts.py: This patch adds a new 
     6        handler for replying custom HTTP error codes. It includes both the 
     7        server side and the administrarion interface module. 
    28 
    39        * cherokee/virtual_server.c, cherokee/util.c, cherokee/util.h, 

  • cherokee/trunk/admin/consts.py

    r1880 r1887  
    99    ('scgi',        'SCGI'), 
    1010    ('server_info', 'Server Info'), 
     11    ('custom_error','HTTP error'), 
    1112    ('mirror',      'Generic balancer'), 
    1213    ('admin',       'Remote Administration') 

  • cherokee/trunk/cherokee/Makefile.am

    r1882 r1887  
    524524else 
    525525dynamic_handler_mirror_lib = libplugin_mirror.la 
     526endif 
     527 
     528 
     529# 
     530# Handler custom_error 
     531# 
     532handler_custom_error = \ 
     533handler_custom_error.c \ 
     534handler_custom_error.h 
     535 
     536libplugin_custom_error_la_LDFLAGS = $(module_ldflags)   
     537libplugin_custom_error_la_SOURCES = $(handler_custom_error) 
     538libplugin_custom_error_la_LIBADD  = libcherokee-client.la   
     539 
     540if STATIC_HANDLER_CUSTOM_ERROR 
     541static_handler_custom_error_src = $(handler_custom_error) 
     542else 
     543dynamic_handler_custom_error_lib = libplugin_custom_error.la 
    526544endif 
    527545 
    …… 
    10001018$(static_handler_proxy_src) \ 
    10011019$(static_handler_mirror_src) \ 
     1020$(static_handler_custom_error_src) \ 
    10021021$(static_handler_server_info_src) \ 
    10031022\ 
    …… 
    11521171$(dynamic_handler_proxy_lib) \ 
    11531172$(dynamic_handler_mirror_lib) \ 
     1173$(dynamic_handler_custom_error_lib) \ 
    11541174$(dynamic_handler_error_redir_lib) \ 
    11551175$(dynamic_handler_error_nn_lib) \ 

  • cherokee/trunk/configure.in

    r1829 r1887  
    11941194           [use_static_module="$use_static_module $enableval "],[]) 
    11951195 
    1196 modules="error_redir error_nn server_info file admin dirlist fcgi fastcgi scgi redir common cgi phpcgi proxy mirror gzip deflate ncsa combined w3c pam ldap mysql htpasswd plain htdigest round_robin directory extensions request header geoip not and or" 
     1196modules="error_redir error_nn server_info file admin dirlist fcgi fastcgi scgi redir common cgi phpcgi proxy mirror custom_error gzip deflate ncsa combined w3c pam ldap mysql htpasswd plain htdigest round_robin directory extensions request header geoip not and or" 
    11971197 
    11981198# Remove modules that will not be compiles 
    …… 
    12601260AM_CONDITIONAL(STATIC_HANDLER_PROXY,          grep proxy          $conf_h >/dev/null) 
    12611261AM_CONDITIONAL(STATIC_HANDLER_MIRROR,         grep mirror         $conf_h >/dev/null) 
     1262AM_CONDITIONAL(STATIC_HANDLER_CUSTOM_ERROR,   grep custom_error   $conf_h >/dev/null) 
    12621263AM_CONDITIONAL(STATIC_ENCODER_GZIP,           grep gzip           $conf_h >/dev/null) 
    12631264AM_CONDITIONAL(STATIC_ENCODER_DEFLATE,        grep deflate        $conf_h >/dev/null)