Changeset 1969

Show
Ignore:
Timestamp:
09/11/08 12:41:17 (4 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1968 r1969  
     12008-09-11  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/handler_dbslayer.h, cherokee/handler_dbslater.c, 
     4        cherokee/dwriter.c, cherokee/dwrite.h, configure.in, 
     5        cherokee/Makefile.am: Adds our brand new data base 
     6        bridge/serializer/balancer. 
     7 
    182008-09-08  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    29 

  • cherokee/trunk/cherokee/Makefile.am

    r1918 r1969  
    528528 
    529529# 
     530# Handler DB Slayer 
     531# 
     532handler_dbslayer = \ 
     533dwriter.c \ 
     534dwriter.h \ 
     535handler_dbslayer.h \ 
     536handler_dbslayer.c 
     537 
     538libplugin_dbslayer_la_LDFLAGS = $(module_ldflags) $(MYSQL_LDFLAGS) 
     539libplugin_dbslayer_la_SOURCES = $(handler_dbslayer) 
     540libplugin_dbslayer_la_CFLAGS  = $(MYSQL_CFLAGS) 
     541 
     542if HAVE_MYSQL 
     543if STATIC_HANDLER_DBSLAYER 
     544static_handler_dbslayer_src   = $(handler_dbslayer) 
     545static_handler_dbslayer_lib   = $(MYSQL_LDFLAGS) 
     546static_handler_dbslayer_flags = $(MYSQL_CFLAGS) 
     547else 
     548dynamic_handler_dbslayer_lib = libplugin_dbslayer.la 
     549endif 
     550endif 
     551 
     552 
     553# 
    530554# Handler custom_error 
    531555# 
    …… 
    823847libcherokee_server_la_CFLAGS = \ 
    824848$(static_validator_htpasswd_flags) \ 
    825 $(static_validator_mysql_flags) 
     849$(static_validator_mysql_flags) \ 
     850$(static_handler_dbslayer_flags) 
    826851 
    827852libcherokee_server_la_LIBADD = \ 
    …… 
    835860$(static_validator_mysql_lib) \ 
    836861$(static_handler_proxy_lib) \ 
     862$(static_handler_dbslayer_lib) \ 
    837863libcherokee-base.la 
    838864 
    …… 
    10201046$(static_handler_custom_error_src) \ 
    10211047$(static_handler_server_info_src) \ 
     1048$(static_handler_dbslayer_src) \ 
    10221049\ 
    10231050$(static_logger_w3c_src) \ 
    …… 
    11751202$(dynamic_handler_error_nn_lib) \ 
    11761203$(dynamic_handler_common_lib) \ 
     1204$(dynamic_handler_dbslayer_lib) \ 
    11771205$(dynamic_encoder_gzip_lib) \ 
    11781206$(dynamic_encoder_deflate_lib) \ 
    …… 
    12741302$(bin_SCRIPTS) \ 
    12751303$(validator_mysql) \ 
     1304$(handler_dbslayer) \ 
    12761305$(cherokeedeps_DATA) \ 
    12771306$(cherokeedata_DATA) \ 

  • cherokee/trunk/configure.in

    r1887 r1969  
    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 custom_error 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 dbslayer 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 
    …… 
    12061206if test "x$have_mysql" != "xyes"; then 
    12071207        modules=`echo $modules | sed s/mysql//` 
     1208        modules=`echo $modules | sed s/dbslayer//` 
    12081209fi 
    12091210if test "x$have_geoip" != "xyes"; then 
    …… 
    12611262AM_CONDITIONAL(STATIC_HANDLER_MIRROR,         grep mirror         $conf_h >/dev/null) 
    12621263AM_CONDITIONAL(STATIC_HANDLER_CUSTOM_ERROR,   grep custom_error   $conf_h >/dev/null) 
     1264AM_CONDITIONAL(STATIC_HANDLER_DBSLAYER,       grep dbslayer       $conf_h >/dev/null) 
    12631265AM_CONDITIONAL(STATIC_ENCODER_GZIP,           grep gzip           $conf_h >/dev/null) 
    12641266AM_CONDITIONAL(STATIC_ENCODER_DEFLATE,        grep deflate        $conf_h >/dev/null)