Changeset 1732

Timestamp:

08/05/08 13:18:29 (5 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/admin/Makefile.am (modified) (1 diff)
• cherokee/trunk/admin/ModuleErrorNn.py (added)
• cherokee/trunk/admin/consts.py (modified) (1 diff)
• cherokee/trunk/cherokee/Makefile.am (modified) (5 diffs)
• cherokee/trunk/cherokee/handler_nn.c (deleted)
• cherokee/trunk/cherokee/handler_nn.h (deleted)
• cherokee/trunk/cherokee/nn.deps (deleted)
• cherokee/trunk/configure.in (modified) (2 diffs)

cherokee/trunk/admin/Makefile.am

@@ -51 +51 @@
-ModuleBalancer.py \
-ModuleMirror.py \
+ModuleErrorNn.py \
-ModuleErrorRedir.py \
-ModuleAuth.py \

cherokee/trunk/admin/consts.py

@@ -16 +16 @@
-    ('',            'Default errors'),
-    ('error_redir', 'Custom redirections'),
-nn',      
+error_nn',
-]
-

cherokee/trunk/cherokee/Makefile.am

@@ -16 +16 @@
-cherokeedepsdir = "$(datadir)/cherokee/deps"
-cherokeedeps_DATA = \
-nn.deps \
-common.deps \
-combined.deps \
@@ -452 +451 @@
-
-#
+# Handler error_nn
+#
+handler_error_nn = \
+levenshtein_distance.c \
+levenshtein_distance.h \
+handler_error_nn.c \
+handler_error_nn.h
+
+if PLATFORM_WIN32
+nn_ldflags_win32 = -lplugin_common -lplugin_redir
+endif
+
+libplugin_error_nn_la_LDFLAGS = $(module_ldflags) $(nn_ldflags_win32)
+libplugin_error_nn_la_SOURCES = $(handler_nn)
+
+if STATIC_HANDLER_ERROR_NN
+static_handler_error_nn_src = $(handler_error_nn)
+else
+dynamic_handler_error_nn_lib = libplugin_error_nn.la
+endif
+
+
+#
-# Handler common
-#
@@ -469 +491 @@
-else
-dynamic_handler_common_lib = libplugin_common.la
-endif
-
-
-#
-# Handler nn
-#
-handler_nn = \
-levenshtein_distance.c \
-levenshtein_distance.h \
-handler_nn.c \
-handler_nn.h
-
-if PLATFORM_WIN32
-nn_ldflags_win32 = -lplugin_common -lplugin_redir
-endif
-
-libplugin_nn_la_LDFLAGS = $(module_ldflags) $(nn_ldflags_win32)
-libplugin_nn_la_SOURCES = $(handler_nn)
-
-if STATIC_HANDLER_NN
-static_handler_nn_src = $(handler_nn)
-else
-dynamic_handler_nn_lib = libplugin_nn.la
-endif
-
@@ -1001 +1000 @@
-$(static_handler_redir_src) \
-$(static_handler_error_redir_src) \
+$(static_handler_error_nn_src) \
-$(static_handler_cgi_src) \
-$(static_handler_phpcgi_src) \
-$(static_handler_common_src) \
-$(static_handler_nn_src) \
-$(static_handler_proxy_src) \
-$(static_handler_mirror_src) \
@@ -1159 +1158 @@
-$(dynamic_handler_mirror_lib) \
-$(dynamic_handler_error_redir_lib) \
+$(dynamic_handler_error_nn_lib) \
-$(dynamic_handler_common_lib) \
-$(dynamic_handler_nn_lib) \
-$(dynamic_encoder_gzip_lib) \
-$(dynamic_encoder_deflate_lib) \

cherokee/trunk/configure.in

@@ -1193 +1193 @@
-           [use_static_module="$use_static_module $enableval "],[])
-
-server_info file admin dirlist fcgi fastcgi scgi redir common n
+error_nn server_info file admin dirlist fcgi fastcgi scgi redir commo
-
-# Remove modules that will not be compiles
@@ -1252 +1252 @@
-AM_CONDITIONAL(STATIC_HANDLER_SCGI,           grep scgi           $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_HANDLER_REDIR,          grep redir          $conf_h >/dev/null)
-
+
+
-AM_CONDITIONAL(STATIC_HANDLER_COMMON,         grep common         $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_HANDLER_NN,             grep nn             $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_HANDLER_CGI,            grep cgi            $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_HANDLER_PHPCGI,         grep phpcgi         $conf_h >/dev/null)