Changeset 1571

Timestamp:

06/18/08 10:05:36 (4 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/Makefile.am (modified) (1 diff)
• cherokee/trunk/cherokee/info.c (added)
• cherokee/trunk/cherokee/info.h (added)
• cherokee/trunk/cherokee/main.c (modified) (2 diffs)
• cherokee/trunk/cherokee/util.c (modified) (1 diff)
• cherokee/trunk/cherokee/util.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-18  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/util.h, cherokee/util.c, cherokee/info.h,
+        cherokee/info.c, cherokee/Makefile.am: As long as the
+        cherokee_server_print_build_info() depends on libcherokee-server
+        functions it has to be relocated within the library.
-
-        * cherokee/avl.c (cherokee_avl_get, cherokee_avl_add)

cherokee/trunk/cherokee/Makefile.am

@@ -1069 +1069 @@
-source.c \
-source_interpreter.h \
-
+
+
+
-
-libcherokee_config_la_SOURCES = \

cherokee/trunk/cherokee/main.c

@@ -27 +27 @@
-#include "init.h"
-#include "server.h"
-
-
+
-
-#ifdef HAVE_GETOPT_H
@@ -287 +286 @@
-        
-        if (print_modules) {
-build_info_print (&srv->loader
+info_build_print (srv
-                exit (ret_ok);
-        }

cherokee/trunk/cherokee/util.c

@@ -1271 +1271 @@
-        fflush (stdout);
-}
-
-
-void
-cherokee_build_info_print (cherokee_plugin_loader_t *loader)
-{
-        cherokee_buffer_t builtin = CHEROKEE_BUF_INIT;
-
-        /* Basic info
-         */
-        printf ("Compilation\n");
-        printf (" Version: " PACKAGE_VERSION "\n");
-        printf (" Compiled on: " __DATE__ " " __TIME__ "\n");
-        printf (" Arguments to configure: " CHEROKEE_CONFIG_ARGS "\n");
-        printf ("\n");
-
-        /* Paths
-         */
-        printf ("Installation\n");
-        printf (" Deps dir: " CHEROKEE_DEPSDIR "\n");
-        printf (" Data dir: " CHEROKEE_DATADIR "\n");
-        printf (" Icons dir: " CHEROKEE_ICONSDIR "\n");
-        printf (" Themes dir: " CHEROKEE_THEMEDIR "\n");
-        printf (" Plug-in dir: " CHEROKEE_PLUGINDIR "\n");
-        printf ("\n");
-
-        /* Print plug-ins information
-         */
-        printf ("Plug-ins\n");
-        cherokee_plugin_loader_get_mods_info (loader, &builtin);
-        printf (" Built-in: %s\n", builtin.buf ? builtin.buf : "");
-        printf ("\n");
-        cherokee_buffer_mrproper (&builtin);
-
-        /* Support
-         */
-        printf ("Support\n");
-#ifdef HAVE_IPV6
-        printf (" IPv6: yes\n");
-#else
-        printf (" IPv6: no\n");
-#endif
-#ifdef HAVE_OPENSSL
-        printf (" OpenSSL: yes\n");
-#else
-        printf (" OpenSSL: no\n");
-#endif
-#ifdef HAVE_GNUTLS
-        printf (" GnuTLS: yes\n");
-#else
-        printf (" GnuTLS: no\n");
-#endif
-#ifdef HAVE_PTHREAD
-        printf (" Pthreads: yes\n");
-#else
-        printf (" Pthreads: no\n");
-#endif
-#ifdef TRACE_ENABLED
-        printf (" Tracing: yes\n");
-#else
-        printf (" Tracing: no\n");
-#endif
-#ifdef HAVE_SENDFILE
-        printf (" sendfile(): yes\n");
-#else
-        printf (" sendfile(): no\n");
-#endif
-#ifdef HAVE_SYSLOG
-        printf (" syslog(): yes\n");
-#else
-        printf (" syslog(): no\n");
-#endif
-        printf ("\n");
-
-
-        printf ("Polling methods\n");
-#ifdef HAVE_PORT
-        printf (" Solaris' port(): yes\n");
-#else
-        printf (" Solaris' port(): no\n");
-#endif
-#ifdef HAVE_SELECT
-        printf (" select(): yes\n");
-#else
-        printf (" select(): no\n");
-#endif
-#ifdef HAVE_WIN32_SELECT
-        printf (" Win32 select(): yes\n");
-#else
-        printf (" Win32 select(): no\n");
-#endif
-#ifdef HAVE_POLL
-        printf (" poll(): yes\n");
-#else
-        printf (" poll(): no\n");
-#endif
-#ifdef HAVE_EPOLL
-        printf (" epoll(): yes\n");
-#else
-        printf (" epoll(): no\n");
-#endif
-#ifdef HAVE_KQUEUE
-        printf (" kqueue(): yes\n");
-#else
-        printf (" kqueue(): no\n");
-#endif
-}

cherokee/trunk/cherokee/util.h

@@ -117 +117 @@
-/* Debug
- */
-
-
-
+
+
-
-/* Path walking