Changeset 354

Timestamp:

08/25/06 00:18:35 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/Makefile.am (modified) (4 diffs)
• cherokee/trunk/cherokee.conf.sample.pre (modified) (1 diff)
• cherokee/trunk/cherokee/access.c (modified) (1 diff)
• cherokee/trunk/cherokee/cherokee_logrotate.c (modified) (1 diff)
• cherokee/trunk/cherokee/config_entry.c (modified) (1 diff)
• cherokee/trunk/cherokee/config_node.c (modified) (8 diffs)
• cherokee/trunk/cherokee/exts_table.c (modified) (1 diff)
• cherokee/trunk/cherokee/fdpoll-protected.h (modified) (1 diff)
• cherokee/trunk/cherokee/fdpoll.c (modified) (1 diff)
• cherokee/trunk/cherokee/header-protected.h (modified) (1 diff)
• cherokee/trunk/cherokee/header.c (modified) (1 diff)
• cherokee/trunk/cherokee/list_ext.c (modified) (2 diffs)
• cherokee/trunk/cherokee/list_ext.h (modified) (2 diffs)
• cherokee/trunk/cherokee/pcre/pcre.c (modified) (1 diff)
• cherokee/trunk/cherokee/socket.c (modified) (6 diffs)
• cherokee/trunk/cherokee/table.c (modified) (1 diff)
• cherokee/trunk/cherokee/util.c (modified) (1 diff)
• cherokee/trunk/cherokee/virtual_server.c (modified) (1 diff)
• cherokee/trunk/icons.conf.sample (modified) (1 diff)

cherokee/trunk/Makefile.am

@@ -30 +30 @@
-        $(top_builddir)/cherokee_replace $< $@ "%sysconfdir%" "${sysconfdir}" "%datadir%" "${datadir}" "%prefix%" "${prefix}" "%wwwroot%" "${WWW_ROOT}"
-
-
+             
-cherokee.conf.sample.pre \
-performance.conf.sample.pre
-
-
-
+
+
+
-mime.compression.types.sample
-
@@ -83 +84 @@
-        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
-        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/ssl
+        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-available
+        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-enabled
+        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-available
+        @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-enabled
-        @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
-                echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \
@@ -105 +110 @@
-        @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
-                $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
+        fi
+        @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons ; then \
+                echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/icons"; \
+        else \
+                $(INSTALL_DATA) $(top_builddir)/icons.conf.sample $(DESTDIR)$(cherokeeconfdir)/mods-available/icons; \
+                $(SHELL) -c "cd $(DESTDIR)$(cherokeeconfdir)/mods-enabled/ && $(LN_S) ../mods-available/icons ."; \
-        fi
-        @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl ; then \
@@ -131 +142 @@
-        fi
-        @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl ; then \
+                echo "rm -f $(cherokeeconfdir)/mods-available/ssl"; \
-                $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl; \
+        fi
+        @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons ; then \
+                echo "rm -f $(cherokeeconfdir)/mods-available/icons"; \
+                $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons; \
-        fi
-

cherokee/trunk/cherokee.conf.sample.pre

@@ -51 +51 @@
-vserver!default!extensions!php!priority = 99999
-
-
-
-
-
-
+
+
-
-icons!file!core = core
-icons!file!*README* = readme.png
-
-icons!suffix!text.png = txt,text
-icons!suffix!image.png = jpg,jpeg,jpe,png,gif,xcf,bmp,pcx,tiff,tif,cdr,psd,xpm,xbm
-icons!suffix!sound.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,m3u,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
-icons!suffix!movie.png = avi,ogg
-icons!suffix!compressed.png = tar,gz,bz2,zip,rar,ace,lha,Z
-icons!suffix!binary.png = bin,exe,com,msi
-icons!suffix!script.png = sh,csh,ksh,tcl,tk,py,pl,php
-icons!suffix!tex.png = tex,latex,ltx,sty,cls
-icons!suffix!ps.png = ps,eps,ai
-icons!suffix!pdf.png = pdf
-icons!suffix!iso.png = iso,ngr,cue
-icons!suffix!java.png = java,class,jar

cherokee/trunk/cherokee/access.c

@@ -434 +434 @@
-                sep = *slash;
-                *slash = '\0';
-urn
+ =
-                *slash = sep;
-                return ret;

cherokee/trunk/cherokee/cherokee_logrotate.c

@@ -24 +24 @@
-
-#include <cherokee/cherokee.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
-
-#include <string.h>

cherokee/trunk/cherokee/config_entry.c

@@ -129 +129 @@
-        }
-
-
+(handler_func_new_t) 
-        entry->handler_methods  = MODULE_INFO_HANDLER(modinfo)->valid_methods;
-

cherokee/trunk/cherokee/config_node.c

@@ -24 +24 @@
-
-#include "common-internal.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
-#include "config_node.h"
-#include "util.h"
@@ -111 +116 @@
-        return n;
-}
+
+
+static ret_t
+do_include (cherokee_config_node_t *conf, cherokee_buffer_t *path) 
+{
+        int         re;
+        struct stat info;
+
+        re = stat (path->buf, &info);
+        if (re < 0) {
+                PRINT_MSG ("Could not access '%s'\n", path->buf);
+                return ret_error;
+        }
+
+        if (S_ISREG(info.st_mode)) {
+                return cherokee_config_node_parse_file (conf, path->buf);
+
+        } else if (S_ISDIR(info.st_mode)) {
+                DIR              *dir;
+                struct dirent    *entry;
+                int               entry_len;
+                
+                dir = opendir (path->buf);
+                if (dir == NULL) return ret_error;
+                
+                while ((entry = readdir(dir)) != NULL) {
+                        ret_t             ret;
+                        cherokee_buffer_t full_new = CHEROKEE_BUF_INIT;
+                        
+                        /* Ignore backup files
+                         */
+                        entry_len = strlen(entry->d_name);
+                        
+                        if ((entry->d_name[0] == '.') ||
+                            (entry->d_name[0] == '#') ||
+                            (entry->d_name[entry_len-1] == '~'))
+                        {
+                                continue;
+                        }
+                        
+                        ret = cherokee_buffer_add_va (&full_new, "%s/%s", path->buf, entry->d_name);
+                        if (unlikely (ret != ret_ok)) return ret;
+
+                        ret = cherokee_config_node_parse_file (conf, full_new.buf);
+                        if (ret != ret_ok) {
+                                cherokee_buffer_mrproper (&full_new);
+                                return ret;
+                        }
+
+                        cherokee_buffer_mrproper (&full_new);
+                }
+                        
+                closedir (dir);
+                return ret_ok;
+        } 
+        
+        SHOULDNT_HAPPEN;
+        return ret_error;
+}
+
-
-ret_t 
@@ -121 +186 @@
-        cherokee_buffer_t       tmp     = CHEROKEE_BUF_INIT;
-        cherokee_boolean_t      final   = false;
+        
+        /* 'include' is a special case
+         */
+        if (equal_str (key, "include")) {
+                return do_include (conf, val);
+        }
-
-        do {
@@ -157 +228 @@
-}
-
+
-ret_t 
-cherokee_config_node_add_buf (cherokee_config_node_t *conf, cherokee_buffer_t *key, cherokee_buffer_t *val)
@@ -162 +234 @@
-        return cherokee_config_node_add (conf, key->buf, val);
-}
+
-
-ret_t
@@ -208 +281 @@
-        return ret_ok;
-}
+
-
-ret_t 
@@ -311 +385 @@
-}
-
+
-ret_t 
-cherokee_config_node_parse_file (cherokee_config_node_t *conf, const char *file)
@@ -428 +503 @@
-}
-
+
-ret_t
-cherokee_config_node_convert_list (cherokee_config_node_t *conf, const char *key, list_t *list)

cherokee/trunk/cherokee/exts_table.c

@@ -54 +54 @@
-cherokee_exts_table_free (cherokee_exts_table_t *et)
-{
-void *)
+cherokee_list_free_func) 
-        cherokee_table_mrproper (&et->table);
-

cherokee/trunk/cherokee/fdpoll-protected.h

@@ -40 +40 @@
-ret_t fdpoll_epoll_new  (cherokee_fdpoll_t **fdp, int sys_limit, int limit);
-ret_t fdpoll_kqueue_new (cherokee_fdpoll_t **fdp, int sys_limit, int limit);
+ret_t fdpoll_port_new   (cherokee_fdpoll_t **fdp, int sys_limit, int limit);
-ret_t fdpoll_poll_new   (cherokee_fdpoll_t **fdp, int sys_limit, int limit);
-ret_t fdpoll_select_new (cherokee_fdpoll_t **fdp, int sys_limit, int limit);

cherokee/trunk/cherokee/fdpoll.c

@@ -26 +26 @@
-#include "fdpoll-protected.h"
-
+
-ret_t 
-cherokee_fdpoll_new (cherokee_fdpoll_t **fdp, cherokee_poll_type_t type, int sys_limit, int limit)

cherokee/trunk/cherokee/header-protected.h

@@ -81 +81 @@
-
-#define HDR_METHOD(h)   (HDR(h)->method)
+#define HDR_VERSION(h)  (HDR(h)->version)
-#define HDR_RESPONSE(h) (HDR(h)->response)
-

cherokee/trunk/cherokee/header.c

@@ -877 +877 @@
-        cuint_t     len;
-
-METHOD
+VERSION
-        if (unlikely(ret != ret_ok)) return ret;
-

cherokee/trunk/cherokee/list_ext.c

@@ -64 +64 @@
-
-ret_t 
-void (*free_func) (void *)
+cherokee_list_free_func free_func
-{
-           list_t *i, *tmp;
@@ -79 +79 @@
-
-ret_t 
-void (*free_func) (void *)
+cherokee_list_free_func free_func
-{
-        list_del (head);

cherokee/trunk/cherokee/list_ext.h

@@ -29 +29 @@
-#include "list.h"
-
+typedef void (*cherokee_list_free_func) (void *);
+
-typedef struct {
-           list_t  list;
@@ -41 +43 @@
-ret_t cherokee_list_add_tail         (list_t *head, void *item);
-
-void (*free_func) (void *)
-void (*free_func) (void *)
+cherokee_list_free_func free_func
+cherokee_list_free_func free_func
-ret_t cherokee_list_free_item_simple (list_t *head);
-

cherokee/trunk/cherokee/pcre/pcre.c

@@ -5567 +5567 @@
-
-const uschar *callpat;             /* Many of these variables are used ony */
-// const uschar *charptr;          /* small blocks of the code. My normal  */
-const uschar *data;                /* style of coding would have declared  */
-// const uschar *lastptr;          /* them within each of those blocks.    */
-const uschar *next;                /* However, in order to accommodate the */
-const uschar *pp;                  /* version of this code that uses an    */

cherokee/trunk/cherokee/socket.c

@@ -209 +209 @@
-db_retrieve (void *ptr, gnutls_datum key)
-{
-       
-       
-       
-       
+
+
+
+
-
-        // printf ("db::retrieve\n");
@@ -225 +225 @@
-        /* Get (and remove) the object from the session cache
-         */
-
+(char *)
-        if (ret != ret_ok) return new;
-
@@ -234 +234 @@
-db_remove (void *ptr, gnutls_datum key)
-{
-       
-       
-       
-       
+
+
+
+
-
-        // printf ("db::remove\n");
@@ -249 +249 @@
-//      ret = cherokee_session_cache_del (cache, key.data, key.size);
-
-
+(char *)
-        if (n != NULL)
-                free (n);
@@ -259 +259 @@
-db_store (void *ptr, gnutls_datum key, gnutls_datum data)
-{
-       
-       
-       
-       
+
+
+
+
-        // printf ("db::store\n");
-
@@ -279 +279 @@
-//      ret = cherokee_session_cache_add (cache, key.data, key.size, data.data, data.size);
-//      cherokee_session_cache_add (cache, key
-
+(char *)
-
-        return (ret == ret_ok) ? 0 : 1;

cherokee/trunk/cherokee/table.c

@@ -204 +204 @@
-        int re;
-
-
+(void *)
-        if (unlikely (re != 0)) return ret_error;
-

cherokee/trunk/cherokee/util.c

@@ -596 +596 @@
-                        goto number;
-                case 'f':
-/ FIXME: Add float numbers support
+* FIXME: Add float numbers support */
-                        len += 30; 
-                        base = 10;
-                        goto number;                    
-                case 'p':
-
+               
-                case 'x':
-                        ul = lflag ? va_arg(ap, culong_t) : va_arg(ap, int);

cherokee/trunk/cherokee/virtual_server.c

@@ -401 +401 @@
-
-                if (info->configure) {
-
+(void **) 
-                        if (ret != ret_ok) return ret;
-                }

cherokee/trunk/icons.conf.sample

@@ +1 @@
+# Icons
-#
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+